diff options
| author | Jussi Pakkanen <jpakkane@gmail.com> | 2017-02-20 21:15:59 +0200 |
|---|---|---|
| committer | Jussi Pakkanen <jpakkane@gmail.com> | 2017-02-20 21:15:59 +0200 |
| commit | c8042b5574e272fff9735a6978a10a20013c9480 (patch) | |
| tree | fd0adb303c2d606ea2b1dbf6b62c8b1fddc58efc /mesonbuild/compilers.py | |
| parent | 8c8ad2cc495bccfd24e9d48f9fed255ecd0756e1 (diff) | |
| parent | 73e36c5b2b085828263067883ec8f47d6580b2a3 (diff) | |
| download | meson-c8042b5574e272fff9735a6978a10a20013c9480.zip meson-c8042b5574e272fff9735a6978a10a20013c9480.tar.gz meson-c8042b5574e272fff9735a6978a10a20013c9480.tar.bz2 | |
Merged clang color.
Diffstat (limited to 'mesonbuild/compilers.py')
| -rw-r--r-- | mesonbuild/compilers.py | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/mesonbuild/compilers.py b/mesonbuild/compilers.py index 5351111..30f2608 100644 --- a/mesonbuild/compilers.py +++ b/mesonbuild/compilers.py @@ -188,6 +188,11 @@ gnu_color_args = {'auto': ['-fdiagnostics-color=auto'], 'never': ['-fdiagnostics-color=never'], } +clang_color_args = {'auto': ['-Xclang', '-fcolor-diagnostics'], + 'always': ['-Xclang', '-fcolor-diagnostics'], + 'never': ['-Xclang', '-fno-color-diagnostics'], + } + base_options = {'b_pch': coredata.UserBooleanOption('b_pch', 'Use precompiled headers', True), 'b_lto': coredata.UserBooleanOption('b_lto', 'Use link time optimization', False), 'b_sanitize': coredata.UserComboOption('b_sanitize', @@ -2427,7 +2432,7 @@ class ClangCompiler: self.id = 'clang' self.clang_type = clang_type self.base_options = ['b_pch', 'b_lto', 'b_pgo', 'b_sanitize', 'b_coverage', - 'b_ndebug', 'b_staticpic'] + 'b_ndebug', 'b_staticpic', 'b_colorout'] if self.clang_type != CLANG_OSX: self.base_options.append('b_lundef') self.base_options.append('b_asneeded') @@ -2439,6 +2444,9 @@ class ClangCompiler: return [] # On Window and OS X, pic is always on. return ['-fPIC'] + def get_colorout_args(self, colortype): + return clang_color_args[colortype][:] + def get_buildtype_args(self, buildtype): return gnulike_buildtype_args[buildtype] |