Commit 9f19b848 authored by Tobias Hunger's avatar Tobias Hunger

Override LC_ALL for the make step

Override LC_ALL in the makestep, not LANG in the toolchain's
addToEnvironment.

Task-number: QTCREATORBUG-6488
Change-Id: Ic3de4f53f99b6b9d88a1337c65aa7f4839d4099d
Reviewed-by: default avatarDaniel Teske <daniel.teske@nokia.com>
parent f6e166e5
......@@ -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)
......
......@@ -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;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment