feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Clang: Autodetect shipped clang binary as C++ compiler

Browse Source 
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 <nikolai.kosjar@qt.io>
This commit is contained in:
Ivan Donchevskii
2018-10-01 17:02:19 +02:00
parent c6dcb46357
commit 74fbcd9c63
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/plugins/projectexplorer/gcctoolchain.cpp
View File

@@ -1331,12 +1331,12 @@ QList<ToolChain *> ClangToolChainFactory::autoDetect(const QList<ToolChain *> &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));
}