aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRodrigo Lourenço <guigo.lourenco@gmail.com>2017-02-20 17:48:04 +0000
committerRodrigo Lourenço <guigo.lourenco@gmail.com>2017-02-20 17:48:04 +0000
commitec1c163da0337dfd5c937d236ad051a9113cce3f (patch)
treebc1dff7dafd3b095478ca399953c6782def37e9b
parent15ecd6aeb2f6189c728030d49c99ff34c4db7674 (diff)
downloadmeson-ec1c163da0337dfd5c937d236ad051a9113cce3f.zip
meson-ec1c163da0337dfd5c937d236ad051a9113cce3f.tar.gz
meson-ec1c163da0337dfd5c937d236ad051a9113cce3f.tar.bz2
Add auto option to b_colored when using Clang. Remove Clang version check when enabling colored output.
-rw-r--r--mesonbuild/compilers.py7
1 files changed, 3 insertions, 4 deletions
diff --git a/mesonbuild/compilers.py b/mesonbuild/compilers.py
index 18a94a1..30f2608 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]