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

GCC: Detect ccache executables

Browse Source 
These are not in the system PATH as to not make them the default, but it
still makes sense to auto-detect them.

Fixes: QTCREATORBUG-23473
Change-Id: Ia044bd948a7a338f34f729e77e1365d048e87172
Reviewed-by: Lisandro Damián Nicanor Pérez Meyer <perezmeyer@gmail.com>
Reviewed-by: hjk <hjk@qt.io>
This commit is contained in:
Christian Kandeler
2020-01-29 13:33:28 +01:00
parent 3890bf4efb
commit 5a2a70adda
1 changed files with 7 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1093,6 +1093,13 @@ QList<ToolChain *> GccToolChainFactory::autoDetectToolchains(
searchPaths << gnuSearchPathsFromRegistry(); searchPaths << gnuSearchPathsFromRegistry();
searchPaths << atmelSearchPathsFromRegistry(); searchPaths << atmelSearchPathsFromRegistry();
searchPaths << renesasRl78SearchPathsFromRegistry(); searchPaths << renesasRl78SearchPathsFromRegistry();
if (HostOsInfo::isAnyUnixHost()) {
FilePath ccachePath = FilePath::fromString("/usr/lib/ccache/bin");
if (!ccachePath.exists())
ccachePath = FilePath::fromString("/usr/lib/ccache");
if (ccachePath.exists() && !searchPaths.contains(ccachePath))
searchPaths << ccachePath;
}
for (const FilePath &dir : searchPaths) { for (const FilePath &dir : searchPaths) {
static const QRegularExpression regexp(binaryRegexp); static const QRegularExpression regexp(binaryRegexp);
QDir binDir(dir.toString()); QDir binDir(dir.toString());