From: Luboš Luňák <l.lunak@centrum.cz>
Date: Thu, 14 Nov 2019 19:23:03 +0000 (+0100)
Subject: Handle properly color diagnostics also in depend mode (#484)
X-Git-Tag: v4.0~710
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=061e57ced8abfd31d7eb41924d64e0765e806d89;p=thirdparty%2Fccache.git

Handle properly color diagnostics also in depend mode (#484)

Compiler invocation in the depend mode uses the original arguments,
which means the added -fcolor-diagnostics (or -fdiagnostics-color)
was dropped.
---

diff --git a/src/ccache.cpp b/src/ccache.cpp
index 25223f17f..53f8b2ff0 100644
--- a/src/ccache.cpp
+++ b/src/ccache.cpp
@@ -129,6 +129,9 @@ char* current_working_dir = NULL;
 // The original argument list.
 static struct args* orig_args;
 
+// Argument list to add to compiler invocation in depend mode.
+static struct args* depend_extra_args;
+
 // The source file.
 static char* input_file;
 
@@ -325,6 +328,19 @@ add_prefix(struct args* args, const char* prefix_command)
   args_free(prefix);
 }
 
+// Compiler in depend mode is invoked with the original arguments.
+// Collect extra arguments that should be added.
+static void
+add_extra_arg(const char* arg)
+{
+  if (g_config.depend_mode()) {
+    if (depend_extra_args == NULL) {
+      depend_extra_args = args_init(0, NULL);
+    }
+    args_add(depend_extra_args, arg);
+  }
+}
+
 static void failed(void) ATTR_NORETURN;
 
 // Something went badly wrong - just execute the real compiler.
@@ -1325,6 +1341,9 @@ to_cache(struct args* args, struct hash* depend_mode_hash)
     assert(orig_args);
     struct args* depend_mode_args = args_copy(orig_args);
     args_strip(depend_mode_args, "--ccache-");
+    if (depend_extra_args) {
+      args_extend(depend_mode_args, depend_extra_args);
+    }
     add_prefix(depend_mode_args, g_config.prefix_command().c_str());
 
     time_of_compilation = time(NULL);
@@ -2982,6 +3001,7 @@ cc_process_args(struct args* args,
       if (color_output_possible()) {
         // Output is redirected, so color output must be forced.
         args_add(common_args, "-fdiagnostics-color=always");
+        add_extra_arg("-fdiagnostics-color=always");
         cc_log("Automatically forcing colors");
       } else {
         args_add(common_args, argv[i]);
@@ -3388,6 +3408,7 @@ cc_process_args(struct args* args,
     if (guessed_compiler == GUESSED_CLANG) {
       if (!str_eq(actual_language, "assembler")) {
         args_add(common_args, "-fcolor-diagnostics");
+        add_extra_arg("-fcolor-diagnostics");
         cc_log("Automatically enabling colors");
       }
     } else if (guessed_compiler == GUESSED_GCC) {
@@ -3397,6 +3418,7 @@ cc_process_args(struct args* args,
       // colors.
       if (getenv("GCC_COLORS") && getenv("GCC_COLORS")[0] != '\0') {
         args_add(common_args, "-fdiagnostics-color");
+        add_extra_arg("-fdiagnostics-color");
         cc_log("Automatically enabling colors");
       }
     }
@@ -3688,6 +3710,8 @@ cc_reset(void)
   free_and_nullify(included_pch_file);
   args_free(orig_args);
   orig_args = NULL;
+  args_free(depend_extra_args);
+  depend_extra_args = NULL;
   free_and_nullify(input_file);
   free_and_nullify(output_obj);
   free_and_nullify(output_dep);