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

GccToolChains: Do not change language based on canonicalPath

Browse Source 
Do not change the language of a compiler based on the canonical
path. This breaks ccache and similar things:-)

Change-Id: I790d630ec493d867df45d24f80e8927ba3189476
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
This commit is contained in:
Tobias Hunger
2017-09-08 14:52:48 +02:00
parent 1acf748f5f
commit acf908fc18
1 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1022,9 +1022,8 @@ QList<ToolChain *> GccToolChainFactory::autoDetectToolchains(const QString &comp
return result; return result;
const FileName canonicalPath = FileUtils::canonicalPath(compilerPath); const FileName canonicalPath = FileUtils::canonicalPath(compilerPath);
result = Utils::filtered(alreadyKnown, [requiredTypeId, canonicalPath](ToolChain *tc) { result = Utils::filtered(alreadyKnown, [requiredTypeId, compilerPath](ToolChain *tc) {
return tc->typeId() == requiredTypeId return tc->typeId() == requiredTypeId && tc->compilerCommand() == compilerPath;
&& FileUtils::canonicalPath(tc->compilerCommand()) == canonicalPath;
}); });
if (!result.isEmpty()) { if (!result.isEmpty()) {
for (ToolChain *tc : result) { for (ToolChain *tc : result) {