diff options
| -rw-r--r-- | src/ccache.cpp | 3 | ||||
| -rw-r--r-- | src/legacy_globals.cpp | 4 | ||||
| -rw-r--r-- | src/legacy_globals.hpp | 2 | ||||
| -rw-r--r-- | unittest/test_argument_processing.cpp | 1 |
4 files changed, 1 insertions, 9 deletions
diff --git a/src/ccache.cpp b/src/ccache.cpp index 96c13564..528ccbec 100644 --- a/src/ccache.cpp +++ b/src/ccache.cpp @@ -1800,7 +1800,7 @@ calculate_result_name(Context& ctx, // they are going to have any effect at all. For precompiled headers this // might not be the case. if (!direct_mode && !output_is_precompiled_header - && !using_precompiled_header) { + && !ctx.args_info.using_precompiled_header) { if (compopt_affects_cpp(args->argv[i])) { if (compopt_takes_arg(args->argv[i])) { i++; @@ -3705,7 +3705,6 @@ do_cache_compilation(Context& ctx, char* argv[]) } output_is_precompiled_header = ctx.args_info.output_is_precompiled_header; - using_precompiled_header = ctx.args_info.using_precompiled_header; arch_args_size = ctx.args_info.arch_args_size; for (size_t i = 0; i < ctx.args_info.arch_args_size; ++i) { diff --git a/src/legacy_globals.cpp b/src/legacy_globals.cpp index fe4af6b3..19b72e0e 100644 --- a/src/legacy_globals.cpp +++ b/src/legacy_globals.cpp @@ -78,10 +78,6 @@ bool output_is_precompiled_header = false; // should hard-depend on it if possible. enum guessed_compiler guessed_compiler = GUESSED_UNKNOWN; -// Whether we are using a precompiled header (either via -include, #include or -// clang's -include-pch or -include-pth). -bool using_precompiled_header = false; - // The .gch/.pch/.pth file used for compilation. char* included_pch_file = nullptr; diff --git a/src/legacy_globals.hpp b/src/legacy_globals.hpp index bc283a14..5719426a 100644 --- a/src/legacy_globals.hpp +++ b/src/legacy_globals.hpp @@ -64,6 +64,4 @@ extern bool output_is_precompiled_header; extern enum guessed_compiler guessed_compiler; -extern bool using_precompiled_header; - extern char* included_pch_file; diff --git a/unittest/test_argument_processing.cpp b/unittest/test_argument_processing.cpp index 0416322c..6171f9bd 100644 --- a/unittest/test_argument_processing.cpp +++ b/unittest/test_argument_processing.cpp @@ -85,7 +85,6 @@ cc_process_args(Context& ctx, compiler_args); output_is_precompiled_header = ctx.args_info.output_is_precompiled_header; - using_precompiled_header = ctx.args_info.using_precompiled_header; return success; } |