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

GccToolChain: Improve findLocalCompiler

Browse Source 
Improve findLocalCompiler to better match the semantics of icecc/distcc.

Task-number: QTCREATORBUG-18902
Change-Id: I06e7957d37bff449ce0188dd5d19e88d25f8e459
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
This commit is contained in:
Tobias Hunger
2017-09-15 17:33:16 +02:00
parent 5e622a3203
commit 2b7c5deadc
1 changed files with 25 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -431,14 +431,32 @@ bool GccToolChain::isValid() const
static Utils::FileName findLocalCompiler(const Utils::FileName &compilerPath,
const Environment &env)
{
const Utils::FileName path = env.searchInPath(compilerPath.fileName(), QStringList(),
[](const QString &pathEntry) {
return !pathEntry.contains("icecc")
&& !pathEntry.contains("distcc");
});
// Find the "real" compiler if icecc, distcc or similar are in use. Ignore ccache, since that
// is local already.
QTC_ASSERT(!path.isEmpty(), return compilerPath);
return path;
// Get the path to the compiler, ignoring direct calls to icecc and distcc as we can not
// do anything about those.
const Utils::FileName compilerDir = compilerPath.parentDir();
const QString compilerDirString = compilerDir.toString();
if (!compilerDirString.contains("icecc") && !compilerDirString.contains("distcc"))
return compilerPath;
QStringList pathComponents = env.path();
auto it = std::find_if(pathComponents.begin(), pathComponents.end(),
[compilerDir](const QString &p) {
return Utils::FileName::fromString(p) == compilerDir;
});
if (it != pathComponents.end()) {
std::rotate(pathComponents.begin(), it, pathComponents.end());
pathComponents.removeFirst(); // remove directory of compilerPath
// No need to put it at the end again, it is in PATH anyway...
}
// This effectively searches the PATH twice, once via pathComponents and once via PATH itself:
// searchInPath filters duplicates, so that will not hurt.
const Utils::FileName path = env.searchInPath(compilerPath.fileName(), pathComponents);
return path.isEmpty() ? compilerPath : path;
}
ToolChain::PredefinedMacrosRunner GccToolChain::createPredefinedMacrosRunner() const