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

ProjectExplorer: Rearrange some statements

Browse Source 
There is no need to set up an environment before the cache check.

Change-Id: Ie3cd7b470d364a318624745c9a9c491ec78470cc
Reviewed-by: David Schulz <david.schulz@qt.io>
This commit is contained in:
Nikolai Kosjar
2017-02-01 11:36:56 +01:00
parent 344b9f7749
commit 69bc252e9d
1 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -359,10 +359,6 @@ bool GccToolChain::isValid() const
QByteArray GccToolChain::predefinedMacros(const QStringList &cxxflags) const QByteArray GccToolChain::predefinedMacros(const QStringList &cxxflags) const
{ {
QStringList allCxxflags = m_platformCodeGenFlags + cxxflags; // add only cxxflags is empty? QStringList allCxxflags = m_platformCodeGenFlags + cxxflags; // add only cxxflags is empty?
// Using a clean environment breaks ccache/distcc/etc.
Environment env = Environment::systemEnvironment();
addToEnvironment(env);
QStringList arguments = gccPredefinedMacrosOptions(); QStringList arguments = gccPredefinedMacrosOptions();
for (int iArg = 0; iArg < allCxxflags.length(); ++iArg) { for (int iArg = 0; iArg < allCxxflags.length(); ++iArg) {
const QString &a = allCxxflags.at(iArg); const QString &a = allCxxflags.at(iArg);
@@ -398,6 +394,9 @@ QByteArray GccToolChain::predefinedMacros(const QStringList &cxxflags) const
if (!macros.isNull()) if (!macros.isNull())
return macros; return macros;
// Using a clean environment breaks ccache/distcc/etc.
Environment env = Environment::systemEnvironment();
addToEnvironment(env);
macros = gccPredefinedMacros(m_compilerCommand, reinterpretOptions(arguments), macros = gccPredefinedMacros(m_compilerCommand, reinterpretOptions(arguments),
env.toStringList()); env.toStringList());