diff options
author | Nikolai Kosjar <nikolai.kosjar@qt.io> | 2017-02-01 11:36:56 +0100 |
---|---|---|
committer | Nikolai Kosjar <nikolai.kosjar@qt.io> | 2017-02-02 13:28:57 +0000 |
commit | 69bc252e9d2d3ca845e2435a12a251c660b48d2f (patch) | |
tree | 462049c4e86e5deb25312ada939b057d65bce83a | |
parent | 344b9f77492d2b8f5e6795293677ee7b7443ea80 (diff) | |
download | qt-creator-69bc252e9d2d3ca845e2435a12a251c660b48d2f.tar.gz |
ProjectExplorer: Rearrange some statements
There is no need to set up an environment before the cache check.
Change-Id: Ie3cd7b470d364a318624745c9a9c491ec78470cc
Reviewed-by: David Schulz <david.schulz@qt.io>
-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()); |