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

ProjectExplorer: Use canonical paths for compiler toolchain match

Browse Source 
On Linux (Ubuntu 20.04) Qt Creator would use /usr/bin/g++ as
compiler for C++. CMake would pick /usr/bin/c++ as C++ compiler.
Both of them are symlinks to /usr/bin/x86_64-linux-gnu-g++-9

ammends 4ae5516453

Change-Id: Id50cb47ed4e728541baed6a191435f2ad0137628
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
This commit is contained in:
Cristian Adam
2021-02-09 13:13:22 +01:00
parent 1641f2eb87
commit 15487863ac
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -38,6 +38,7 @@
#include <coreplugin/icore.h> #include <coreplugin/icore.h>
#include <utils/algorithm.h> #include <utils/algorithm.h>
#include <utils/environment.h>
#include <utils/qtcassert.h> #include <utils/qtcassert.h>
#include <QLoggingCategory> #include <QLoggingCategory>
@@ -394,7 +395,9 @@ ProjectImporter::findOrCreateToolChains(const ToolChainDescription &tcd) const
{ {
ToolChainData result; ToolChainData result;
result.tcs = ToolChainManager::toolChains([&tcd](const ToolChain *tc) { result.tcs = ToolChainManager::toolChains([&tcd](const ToolChain *tc) {
return tc->language() == tcd.language && tc->compilerCommand() == tcd.compilerPath; return tc->language() == tcd.language &&
Utils::Environment::systemEnvironment().isSameExecutable(
tc->compilerCommand().toString(), tcd.compilerPath.toString());
}); });
for (const ToolChain *tc : result.tcs) { for (const ToolChain *tc : result.tcs) {
const QByteArray tcId = tc->id(); const QByteArray tcId = tc->id();