From: Joel Rosdahl <joel@rosdahl.net>
Date: Fri, 22 Dec 2023 12:41:17 +0000 (+0100)
Subject: feat: Add support for undocumented GCC/Clang --include option
X-Git-Tag: v4.9~4
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d31ab9586cb7c4b951315a36321f0a254ad6f153;p=thirdparty%2Fccache.git

feat: Add support for undocumented GCC/Clang --include option

Note: Clang accepts a concatenated argument (--includefoo.h) but GCC
does not.

Closes #1324.
---

diff --git a/src/argprocessing.cpp b/src/argprocessing.cpp
index 82b136465..93046e13a 100644
--- a/src/argprocessing.cpp
+++ b/src/argprocessing.cpp
@@ -440,7 +440,7 @@ process_option_arg(const Context& ctx,
   if (arg == "-Xclang" && i + 1 < args.size()
       && (args[i + 1] == "-emit-pch" || args[i + 1] == "-emit-pth"
           || args[i + 1] == "-include-pch" || args[i + 1] == "-include-pth"
-          || args[i + 1] == "-include"
+          || args[i + 1] == "-include" || args[i + 1] == "--include"
           || args[i + 1] == "-fno-pch-timestamp")) {
     if (compopt_affects_compiler_output(args[i + 1])) {
       state.compiler_only_args.push_back(args[i]);
diff --git a/src/compopt.cpp b/src/compopt.cpp
index 5943e3fab..3b268f6d9 100644
--- a/src/compopt.cpp
+++ b/src/compopt.cpp
@@ -56,8 +56,9 @@ const CompOpt compopts[] = {
   {"--compiler-options", AFFECTS_CPP | TAKES_ARG},     // nvcc
   {"--config", TAKES_ARG},                             // Clang
   {"--gcc-toolchain=", TAKES_CONCAT_ARG | TAKES_PATH}, // Clang
-  {"--libdevice-directory", AFFECTS_CPP | TAKES_ARG},  // nvcc
-  {"--output-directory", AFFECTS_CPP | TAKES_ARG},     // nvcc
+  {"--include", AFFECTS_CPP | TAKES_ARG | TAKES_CONCAT_ARG | TAKES_PATH},
+  {"--libdevice-directory", AFFECTS_CPP | TAKES_ARG}, // nvcc
+  {"--output-directory", AFFECTS_CPP | TAKES_ARG},    // nvcc
   {"--param", TAKES_ARG},
   {"--save-temps", TOO_HARD},
   {"--save-temps=cwd", TOO_HARD},