From 69bc252e9d2d3ca845e2435a12a251c660b48d2f Mon Sep 17 00:00:00 2001 From: Nikolai Kosjar Date: Wed, 1 Feb 2017 11:36:56 +0100 Subject: [PATCH] ProjectExplorer: Rearrange some statements There is no need to set up an environment before the cache check. Change-Id: Ie3cd7b470d364a318624745c9a9c491ec78470cc Reviewed-by: David Schulz --- src/plugins/projectexplorer/gcctoolchain.cpp | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/src/plugins/projectexplorer/gcctoolchain.cpp b/src/plugins/projectexplorer/gcctoolchain.cpp index 19360923e98..3575de40ddf 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());