aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorkiwixz <kiwixz@outlook.com>2023-08-07 23:53:30 +0200
committerEli Schwartz <eschwartz93@gmail.com>2023-08-08 16:46:03 -0400
commit3de0f6d4e94036646321859b9287faba6e99f050 (patch)
tree6f2ffeb85feb66fafd3d5472a4f55840eeb29c75
parent6671b7359fd042f576f5b944b67f73ced89fe5a6 (diff)
downloadmeson-3de0f6d4e94036646321859b9287faba6e99f050.zip
meson-3de0f6d4e94036646321859b9287faba6e99f050.tar.gz
meson-3de0f6d4e94036646321859b9287faba6e99f050.tar.bz2
clang: use gcc syntax to enable diagnostics color
clang has supported gcc syntax since version 3.3.0 from 10 years ago. It's better than its own version because it takes a "when" verb which allows us to explicitely ask for "auto". This is useful when overriding flags that came from elsewhere. Before this patch, meson was just treating b_colorout="auto" as "always".
-rw-r--r--mesonbuild/compilers/mixins/clang.py6
1 files changed, 3 insertions, 3 deletions
diff --git a/mesonbuild/compilers/mixins/clang.py b/mesonbuild/compilers/mixins/clang.py
index 24f24a8..6a9c79b 100644
--- a/mesonbuild/compilers/mixins/clang.py
+++ b/mesonbuild/compilers/mixins/clang.py
@@ -31,9 +31,9 @@ if T.TYPE_CHECKING:
from ...dependencies import Dependency # noqa: F401
clang_color_args: T.Dict[str, T.List[str]] = {
- 'auto': ['-fcolor-diagnostics'],
- 'always': ['-fcolor-diagnostics'],
- 'never': ['-fno-color-diagnostics'],
+ 'auto': ['-fdiagnostics-color=auto'],
+ 'always': ['-fdiagnostics-color=always'],
+ 'never': ['-fdiagnostics-color=never'],
}
clang_optimization_args: T.Dict[str, T.List[str]] = {