diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/plugins/projectexplorer/gcctoolchain.cpp | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/src/plugins/projectexplorer/gcctoolchain.cpp b/src/plugins/projectexplorer/gcctoolchain.cpp index 19360923e9..3575de40dd 100644 --- a/src/plugins/projectexplorer/gcctoolchain.cpp +++ b/src/plugins/projectexplorer/gcctoolchain.cpp @@ -359,10 +359,6 @@ bool GccToolChain::isValid() const QByteArray GccToolChain::predefinedMacros(const QStringList &cxxflags) const { 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(); for (int iArg = 0; iArg < allCxxflags.length(); ++iArg) { const QString &a = allCxxflags.at(iArg); @@ -398,6 +394,9 @@ QByteArray GccToolChain::predefinedMacros(const QStringList &cxxflags) const if (!macros.isNull()) return macros; + // Using a clean environment breaks ccache/distcc/etc. + Environment env = Environment::systemEnvironment(); + addToEnvironment(env); macros = gccPredefinedMacros(m_compilerCommand, reinterpretOptions(arguments), env.toStringList()); |