Recognize gcc and clang (not just their c++ variants) in tool-chain detection.

1 files changed, 4 insertions, 2 deletions

diff --git a/src/tools.cc b/src/tools.cc
index 6d4c34b..a83f115 100644
--- a/src/tools.cc
+++ b/src/tools.cc
@@ -109,11 +109,13 @@ ctor::toolchain getToolChain(const std::string& compiler)
 	auto cc_cmd = cc.stem().string();
 
 	// Note: "g++" is a substring of "clang++" so "clang++" must be tested first.
-	if(cc_cmd.find("clang++") != std::string::npos)
+	if(cc_cmd.find("clang++") != std::string::npos ||
+	   cc_cmd.find("clang") != std::string::npos)
 	{
 		return ctor::toolchain::clang;
 	}
-	else if(cc_cmd.find("g++") != std::string::npos)
+	else if(cc_cmd.find("g++") != std::string::npos ||
+	        cc_cmd.find("gcc") != std::string::npos)
 	{
 		return ctor::toolchain::gcc;
 	}