From acf908fc18291ed009e8ad66848700968bd54e88 Mon Sep 17 00:00:00 2001 From: Tobias Hunger Date: Fri, 8 Sep 2017 14:52:48 +0200 Subject: [PATCH] GccToolChains: Do not change language based on canonicalPath 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 --- src/plugins/projectexplorer/gcctoolchain.cpp | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/plugins/projectexplorer/gcctoolchain.cpp b/src/plugins/projectexplorer/gcctoolchain.cpp index 7738b74bac8..102441bdf1a 100644 --- a/src/plugins/projectexplorer/gcctoolchain.cpp +++ b/src/plugins/projectexplorer/gcctoolchain.cpp @@ -1022,9 +1022,8 @@ QList GccToolChainFactory::autoDetectToolchains(const QString &comp return result; const FileName canonicalPath = FileUtils::canonicalPath(compilerPath); - result = Utils::filtered(alreadyKnown, [requiredTypeId, canonicalPath](ToolChain *tc) { - return tc->typeId() == requiredTypeId - && FileUtils::canonicalPath(tc->compilerCommand()) == canonicalPath; + result = Utils::filtered(alreadyKnown, [requiredTypeId, compilerPath](ToolChain *tc) { + return tc->typeId() == requiredTypeId && tc->compilerCommand() == compilerPath; }); if (!result.isEmpty()) { for (ToolChain *tc : result) {