]> git.ipfire.org Git - thirdparty/ccache.git/commitdiff
Guess compiler using substring search again
authorJoel Rosdahl <joel@rosdahl.net>
Fri, 8 May 2020 18:11:53 +0000 (20:11 +0200)
committerJoel Rosdahl <joel@rosdahl.net>
Fri, 8 May 2020 18:11:53 +0000 (20:11 +0200)
Regression in 30c10e8791bd02a8a3b13beeda875adbefa8c7ab.

src/ccache.cpp

index 205b0b5a4f7e28ff02964fd93a5b0ed727da7d57..bd73f6a55ad6feecb7218a3b9dc1264755035595 100644 (file)
@@ -402,11 +402,12 @@ guess_compiler(const char* path)
 {
   string_view name = Util::base_name(path);
   GuessedCompiler result = GuessedCompiler::unknown;
-  if (name == "clang") {
+  if (name.find("clang") != std::string::npos) {
     result = GuessedCompiler::clang;
-  } else if (name == "gcc" || name == "g++") {
+  } else if (name.find("gcc") != std::string::npos
+             || name.find("g++") != std::string::npos) {
     result = GuessedCompiler::gcc;
-  } else if (name == "nvcc") {
+  } else if (name.find("nvcc") != std::string::npos) {
     result = GuessedCompiler::nvcc;
   } else if (name == "pump" || name == "distcc-pump") {
     result = GuessedCompiler::pump;