From ec1c163da0337dfd5c937d236ad051a9113cce3f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rodrigo=20Louren=C3=A7o?= Date: Mon, 20 Feb 2017 17:48:04 +0000 Subject: [PATCH] Add auto option to b_colored when using Clang. Remove Clang version check when enabling colored output. --- mesonbuild/compilers.py | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/mesonbuild/compilers.py b/mesonbuild/compilers.py index 18a94a138..30f260836 100644 --- a/mesonbuild/compilers.py +++ b/mesonbuild/compilers.py @@ -188,7 +188,8 @@ gnu_color_args = {'auto': ['-fdiagnostics-color=auto'], 'never': ['-fdiagnostics-color=never'], } -clang_color_args = {'always': ['-Xclang', '-fcolor-diagnostics'], +clang_color_args = {'auto': ['-Xclang', '-fcolor-diagnostics'], + 'always': ['-Xclang', '-fcolor-diagnostics'], 'never': ['-Xclang', '-fno-color-diagnostics'], } @@ -2444,9 +2445,7 @@ class ClangCompiler: return ['-fPIC'] def get_colorout_args(self, colortype): - if mesonlib.version_compare(self.version, '>=3.1'): - return clang_color_args[colortype][:] - return [] + return clang_color_args[colortype][:] def get_buildtype_args(self, buildtype): return gnulike_buildtype_args[buildtype]