summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/plugins/projectexplorer/gcctoolchain.cpp1
-rw-r--r--src/plugins/qt4projectmanager/makestep.cpp13
2 files changed, 12 insertions, 2 deletions
diff --git a/src/plugins/projectexplorer/gcctoolchain.cpp b/src/plugins/projectexplorer/gcctoolchain.cpp
index 13dc89fff0..24aeb95908 100644
--- a/src/plugins/projectexplorer/gcctoolchain.cpp
+++ b/src/plugins/projectexplorer/gcctoolchain.cpp
@@ -382,7 +382,6 @@ void GccToolChain::addToEnvironment(Utils::Environment &env) const
{
if (!m_compilerPath.isEmpty())
env.prependOrSetPath(QFileInfo(m_compilerPath).absolutePath());
- env.set(QLatin1String("LANG"), QLatin1String("C"));
}
void GccToolChain::setDebuggerCommand(const QString &d)
diff --git a/src/plugins/qt4projectmanager/makestep.cpp b/src/plugins/qt4projectmanager/makestep.cpp
index 0feadd5924..5dc01d82fc 100644
--- a/src/plugins/qt4projectmanager/makestep.cpp
+++ b/src/plugins/qt4projectmanager/makestep.cpp
@@ -143,6 +143,11 @@ bool MakeStep::init()
pp->setMacroExpander(bc->macroExpander());
Utils::Environment environment = bc->environment();
+
+ // Force output to english for the parsers. Do this here and not in the toolchain's
+ // addToEnvironment() to not screw up the users run environment.
+ environment.set(QLatin1String("LC_ALL"), QLatin1String("C"));
+
pp->setEnvironment(environment);
QString workingDirectory;
@@ -342,7 +347,13 @@ void MakeStepConfigWidget::updateDetails()
ProjectExplorer::ProcessParameters param;
param.setMacroExpander(bc->macroExpander());
param.setWorkingDirectory(bc->buildDirectory());
- param.setEnvironment(bc->environment());
+ Utils::Environment environment = bc->environment();
+
+ // Force output to english for the parsers. Do this here and not in the toolchain's
+ // addToEnvironment() to not screw up the users run environment.
+ environment.set(QLatin1String("LC_ALL"), QLatin1String("C"));
+ param.setEnvironment(environment);
+
QString makeCmd = bc->makeCommand();
if (!m_makeStep->m_makeCmd.isEmpty())
makeCmd = m_makeStep->m_makeCmd;