From: Joel Rosdahl <joel@rosdahl.net>
Date: Fri, 8 May 2020 18:11:53 +0000 (+0200)
Subject: Guess compiler using substring search again
X-Git-Tag: v4.0~471
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1df897f002d8f57ec78aafa74efa0f30f0bc22f5;p=thirdparty%2Fccache.git

Guess compiler using substring search again

Regression in 30c10e8791bd02a8a3b13beeda875adbefa8c7ab.
---

diff --git a/src/ccache.cpp b/src/ccache.cpp
index 205b0b5a4..bd73f6a55 100644
--- a/src/ccache.cpp
+++ b/src/ccache.cpp
@@ -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;