From: Joel Rosdahl <joel@rosdahl.net>
Date: Sat, 6 Nov 2021 18:25:32 +0000 (+0100)
Subject: feat: Support rewriting absolute path to Clang option --gcc-toolchain
X-Git-Tag: v4.5~7
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=71d264cf50e7cec3681bcd64f47833da278457cd;p=thirdparty%2Fccache.git

feat: Support rewriting absolute path to Clang option --gcc-toolchain

Closes #889.
---

diff --git a/src/compopt.cpp b/src/compopt.cpp
index 8cc516e0b..e2f0fe1e4 100644
--- a/src/compopt.cpp
+++ b/src/compopt.cpp
@@ -54,12 +54,13 @@ struct CompOpt
 };
 
 const CompOpt compopts[] = {
-  {"--Werror", TAKES_ARG},                            // nvcc
-  {"--analyze", TOO_HARD},                            // Clang
-  {"--compiler-bindir", AFFECTS_CPP | TAKES_ARG},     // nvcc
-  {"--config", TAKES_ARG},                            // Clang
-  {"--libdevice-directory", AFFECTS_CPP | TAKES_ARG}, // nvcc
-  {"--output-directory", AFFECTS_CPP | TAKES_ARG},    // nvcc
+  {"--Werror", TAKES_ARG},                             // nvcc
+  {"--analyze", TOO_HARD},                             // Clang
+  {"--compiler-bindir", 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
   {"--param", TAKES_ARG},
   {"--save-temps", TOO_HARD},
   {"--save-temps=cwd", TOO_HARD},
@@ -105,6 +106,7 @@ const CompOpt compopts[] = {
   {"-frepo", TOO_HARD},
   {"-ftime-trace", TOO_HARD}, // Clang
   {"-fworking-directory", AFFECTS_CPP},
+  {"-gcc-toolchain", TAKES_ARG | TAKES_PATH},       // Clang
   {"-gen-cdb-fragment-path", TAKES_ARG | TOO_HARD}, // Clang
   {"-gtoggle", TOO_HARD},
   {"-idirafter", AFFECTS_CPP | TAKES_ARG | TAKES_CONCAT_ARG | TAKES_PATH},