From: Joel Rosdahl <joel@rosdahl.net>
Date: Sun, 5 May 2024 16:56:39 +0000 (+0200)
Subject: fix: Handle -fdiagnostics-color for Clang again
X-Git-Tag: v4.10~28
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=523c2e7b3b2eb64abbf2244a914f179571096593;p=thirdparty%2Fccache.git

fix: Handle -fdiagnostics-color for Clang again

Regression in 96ec6c9d98b88f00e1a69bdd0214c237bc7ed04e (ccache 4.6.2).

Fixes #1446.
---

diff --git a/src/ccache/argprocessing.cpp b/src/ccache/argprocessing.cpp
index f58d7c16..6208b9df 100644
--- a/src/ccache/argprocessing.cpp
+++ b/src/ccache/argprocessing.cpp
@@ -1022,11 +1022,14 @@ process_option_arg(const Context& ctx,
       ++i;
       arg = make_dash_option(ctx.config, args[i]);
     }
-    if (arg == "-fcolor-diagnostics") {
+    if (arg == "-fdiagnostics-color" || arg == "-fdiagnostics-color=always"
+        || arg == "-fcolor-diagnostics") {
       state.color_diagnostics = ColorDiagnostics::always;
       state.compiler_only_args_no_hash.push_back(args[i]);
       return Statistic::none;
-    } else if (arg == "-fno-color-diagnostics") {
+    } else if (arg == "-fno-diagnostics-color"
+               || arg == "-fdiagnostics-color=never"
+               || arg == "-fno-color-diagnostics") {
       state.color_diagnostics = ColorDiagnostics::never;
       state.compiler_only_args_no_hash.push_back(args[i]);
       return Statistic::none;