aboutsummaryrefslogtreecommitdiff
path: root/libbuild2/cc/common.cxx
diff options
context:
space:
mode:
authorBoris Kolpackov <boris@codesynthesis.com>2024-05-09 09:03:29 +0200
committerBoris Kolpackov <boris@codesynthesis.com>2024-05-09 09:06:49 +0200
commit2f191a6c6cf1c7802c31fc73e01c5bac17a7f4f1 (patch)
treef9caac734b256a8e02d1392315f2f48596569415 /libbuild2/cc/common.cxx
parentfa7501ac8723648991ba05539732bbba2902f8d9 (diff)
Fixes and tweaks to diagnostics color support on Windows (GH issue #312)
Specifically: - Pass -fansi-escape-codes for Clang on Windows. - Enable diagnostics color by default if already enabled on the terminal. Only try to enable it ourselves with explicit --diag-color.
Diffstat (limited to 'libbuild2/cc/common.cxx')
-rw-r--r--libbuild2/cc/common.cxx14
1 files changed, 13 insertions, 1 deletions
diff --git a/libbuild2/cc/common.cxx b/libbuild2/cc/common.cxx
index 2a8bc50..9a4a07c 100644
--- a/libbuild2/cc/common.cxx
+++ b/libbuild2/cc/common.cxx
@@ -1691,6 +1691,10 @@ namespace build2
// Note that clang-cl appears to use -fansi-escape-codes. See GH
// issue #312 for background.
//
+ // Note that MSVC ignores /diagnostics:color if diagnostics is
+ // written to a pipe. See GH issue #312 for details and a link to
+ // the MSVC bug report.
+ //
if (show_diag_color ())
{
if (cvariant.empty () &&
@@ -1716,7 +1720,8 @@ namespace build2
//
// Supported from GCC 4.9 (8.1 on Windows) and (at least) from Clang
// 3.5. Clang supports -f[no]color-diagnostics in addition to the
- // GCC's spelling.
+ // GCC's spelling. Note that to enable color on Windows Clang also
+ // needs -fansi-escape-codes.
//
if (
#ifndef _WIN32
@@ -1742,7 +1747,14 @@ namespace build2
show_diag_color () ? "-fdiagnostics-color" :
stderr_term ? "-fno-diagnostics-color" :
nullptr))
+ {
args.push_back (o);
+
+#ifdef _WIN32
+ if (ctype == compiler_type::clang && o[2] != 'n')
+ args.push_back ("-fansi-escape-codes");
+#endif
+ }
}
}