From 74fbcd9c636aff09ee1f347a7a19313640aeba32 Mon Sep 17 00:00:00 2001 From: Ivan Donchevskii Date: Mon, 1 Oct 2018 17:02:19 +0200 Subject: [PATCH] Clang: Autodetect shipped clang binary as C++ compiler We do not ship clang++ so it makes sense to detect clang not only as a C compiler. Change-Id: I37b95e38f253e6407fa27397815d9bcdbbd4a8e2 Reviewed-by: Nikolai Kosjar --- src/plugins/projectexplorer/gcctoolchain.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/plugins/projectexplorer/gcctoolchain.cpp b/src/plugins/projectexplorer/gcctoolchain.cpp index b01b1473ea1..82dd441cce5 100644 --- a/src/plugins/projectexplorer/gcctoolchain.cpp +++ b/src/plugins/projectexplorer/gcctoolchain.cpp @@ -1331,12 +1331,12 @@ QList ClangToolChainFactory::autoDetect(const QList &a const FileName compilerPath = FileName::fromString(Core::ICore::clangExecutable(CLANG_BINDIR)); if (!compilerPath.isEmpty()) { - tcs.append(autoDetectToolchains(compilerPath.parentDir().appendPath( - HostOsInfo::withExecutableSuffix("clang++")), + const FileName clang = compilerPath.parentDir().appendPath( + HostOsInfo::withExecutableSuffix("clang")); + tcs.append(autoDetectToolchains(clang, hostAbi, Constants::CXX_LANGUAGE_ID, Constants::CLANG_TOOLCHAIN_TYPEID, alreadyKnown)); - tcs.append(autoDetectToolchains(compilerPath.parentDir().appendPath( - HostOsInfo::withExecutableSuffix("clang")), + tcs.append(autoDetectToolchains(clang, hostAbi, Constants::C_LANGUAGE_ID, Constants::CLANG_TOOLCHAIN_TYPEID, alreadyKnown)); }