Context: move actual_language

diff --git a/src/ccache.cpp b/src/ccache.cpp
index e329f7bea79b570e1f6957c14a0f668d8dd3bef9..e61fbdea0d912c3d324d395092619649a4daacb3 100644 (file)
--- a/src/ccache.cpp
+++ b/src/ccache.cpp
@@ -1907,7 +1907,7 @@ calculate_result_name(Context& ctx,
     hash_delimiter(hash, "/dev/null dependency file");
   }
 
-  if (!found_ccbin && str_eq(actual_language, "cu")) {
+  if (!found_ccbin && ctx.args_info.actual_language == "cu") {
     hash_nvcc_host_compiler(hash, NULL, NULL);
   }
 
@@ -3707,8 +3707,6 @@ do_cache_compilation(Context& ctx, char* argv[])
     failed(); // stats_update is called in cc_process_args.
   }
 
-  actual_language = x_strdup(ctx.args_info.actual_language.c_str());
-
   generating_dependencies = ctx.args_info.generating_dependencies;
   generating_coverage = ctx.args_info.generating_coverage;
   generating_stackusage = ctx.args_info.generating_stackusage;

diff --git a/src/legacy_globals.cpp b/src/legacy_globals.cpp
index 00c24951424ce53d369fa5272e9316adc483c6a0..6fc9cd8bbc857daac66f64f160aca00a6a910525 100644 (file)
--- a/src/legacy_globals.cpp
+++ b/src/legacy_globals.cpp
@@ -25,9 +25,6 @@ char* current_working_dir = nullptr;
 extern struct args* orig_args;
 struct args* orig_args = nullptr;
 
-// Language to use for the compilation target (see language.c).
-const char* actual_language;
-
 // Array for storing -arch options.
 size_t arch_args_size = 0;
 char* arch_args[MAX_ARCH_ARGS] = {nullptr};

diff --git a/src/legacy_globals.hpp b/src/legacy_globals.hpp
index d47d8592ffaa06102fbbea4b1660b7764ebefa20..64105e0feb6f4be8c9215070f9549fd3a466ba36 100644 (file)
--- a/src/legacy_globals.hpp
+++ b/src/legacy_globals.hpp
@@ -34,8 +34,6 @@ extern unsigned lock_staleness_limit;
 
 extern struct args* orig_args;
 
-extern const char* actual_language;
-
 #define MAX_ARCH_ARGS 10
 extern size_t arch_args_size;
 extern char* arch_args[MAX_ARCH_ARGS];

diff --git a/unittest/test_argument_processing.cpp b/unittest/test_argument_processing.cpp
index 0967e58ca868af584bec22d2880b0c70dfff89ca..cab64142a3e61e6911cc0d66eeebe6a8ddcb917d 100644 (file)
--- a/unittest/test_argument_processing.cpp
+++ b/unittest/test_argument_processing.cpp
@@ -84,8 +84,6 @@ cc_process_args(Context& ctx,
                                  extra_args_to_hash,
                                  compiler_args);
 
-  actual_language = x_strdup(ctx.args_info.actual_language.c_str());
-
   generating_dependencies = ctx.args_info.generating_dependencies;
   generating_coverage = ctx.args_info.generating_coverage;
   generating_stackusage = ctx.args_info.generating_stackusage;