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

GCC: Auto-detect also cross-compilers on linux

Browse Source 
Change-Id: I925980d2b345a9f9e3ff11f369938eb8d216f1d5
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
This commit is contained in:
Orgad Shaneh
2017-07-14 15:47:03 +03:00
committed by Orgad Shaneh
parent 7f4696235b
commit 7fd827e762
1 changed files with 36 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -42,6 +42,7 @@
#include <QBuffer> #include <QBuffer>
#include <QCoreApplication> #include <QCoreApplication>
#include <QDir>
#include <QFileInfo> #include <QFileInfo>
#include <QLineEdit> #include <QLineEdit>
@@ -920,10 +921,29 @@ ToolChain *GccToolChainFactory::create(Core::Id language)
QList<ToolChain *> GccToolChainFactory::autoDetect(const QList<ToolChain *> &alreadyKnown) QList<ToolChain *> GccToolChainFactory::autoDetect(const QList<ToolChain *> &alreadyKnown)
{ {
QList<ToolChain *> tcs; QList<ToolChain *> tcs;
QList<ToolChain *> known = alreadyKnown;
tcs.append(autoDetectToolchains("g++", Abi::hostAbi(), Constants::CXX_LANGUAGE_ID, tcs.append(autoDetectToolchains("g++", Abi::hostAbi(), Constants::CXX_LANGUAGE_ID,
Constants::GCC_TOOLCHAIN_TYPEID, alreadyKnown)); Constants::GCC_TOOLCHAIN_TYPEID, alreadyKnown));
tcs.append(autoDetectToolchains("gcc", Abi::hostAbi(), Constants::C_LANGUAGE_ID, tcs.append(autoDetectToolchains("gcc", Abi::hostAbi(), Constants::C_LANGUAGE_ID,
Constants::GCC_TOOLCHAIN_TYPEID, alreadyKnown)); Constants::GCC_TOOLCHAIN_TYPEID, alreadyKnown));
known.append(tcs);
if (HostOsInfo::isLinuxHost()) {
for (const QString &dir : QStringList({ "/usr/bin", "/usr/local/bin" })) {
QDir binDir(dir);
for (const QString &entry : binDir.entryList({"*-g++"}, QDir::Files | QDir::Executable)) {
tcs.append(autoDetectToolchains(entry, Abi(), Constants::CXX_LANGUAGE_ID,
Constants::GCC_TOOLCHAIN_TYPEID, known));
known.append(tcs);
}
for (const QString &entry : binDir.entryList({"*-gcc"}, QDir::Files | QDir::Executable)) {
if (entry.endsWith("c89-gcc") || entry.endsWith("c99-gcc"))
continue;
tcs.append(autoDetectToolchains(entry, Abi(), Constants::C_LANGUAGE_ID,
Constants::GCC_TOOLCHAIN_TYPEID, known));
known.append(tcs);
}
}
}
return tcs; return tcs;
} }
@@ -972,11 +992,12 @@ QList<ToolChain *> GccToolChainFactory::autoDetectToolchains(const QString &comp
const FileName compilerPath = systemEnvironment.searchInPath(compiler); const FileName compilerPath = systemEnvironment.searchInPath(compiler);
if (compilerPath.isEmpty()) if (compilerPath.isEmpty())
return result; return result;
const FileName canonicalPath = FileUtils::canonicalPath(compilerPath);
result = Utils::filtered(alreadyKnown, [requiredTypeId, compilerPath](ToolChain *tc) { result = Utils::filtered(alreadyKnown, [requiredTypeId, canonicalPath](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) {
if (tc->isAutoDetected()) if (tc->isAutoDetected())
@@ -987,15 +1008,17 @@ QList<ToolChain *> GccToolChainFactory::autoDetectToolchains(const QString &comp
result = autoDetectToolChain(compilerPath, language, requiredAbi); result = autoDetectToolChain(compilerPath, language, requiredAbi);
const Abi alternateAbi = Abi(requiredAbi.architecture(), requiredAbi.os(), if (!requiredAbi.isNull()) {
requiredAbi.osFlavor(), requiredAbi.binaryFormat(), 32); const Abi alternateAbi = Abi(requiredAbi.architecture(), requiredAbi.os(),
ToolChain *abiTc = Utils::findOrDefault(result, [&requiredAbi, &alternateAbi](const ToolChain *tc) { requiredAbi.osFlavor(), requiredAbi.binaryFormat(), 32);
return requiredAbi == tc->targetAbi() ToolChain *abiTc = Utils::findOrDefault(result, [&requiredAbi, &alternateAbi](const ToolChain *tc) {
|| (requiredAbi.wordWidth() == 64 && tc->targetAbi() == alternateAbi); return requiredAbi == tc->targetAbi()
}); || (requiredAbi.wordWidth() == 64 && tc->targetAbi() == alternateAbi);
if (!abiTc) { });
qDeleteAll(result); if (!abiTc) {
result.clear(); qDeleteAll(result);
result.clear();
}
} }
return result; return result;