feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Actually pass MAKEFLAGS to nmake/jom

Browse Source 
Change-Id: Ia42fccff507fce1e999d4534656984b6ebf5180b
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
This commit is contained in:
Daniel Teske
2011-11-16 16:08:15 +01:00
parent 97dc1d4ab4
commit 5f8b341838
1 changed files with 14 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/plugins/qt4projectmanager/makestep.cpp
View File

@@ -142,9 +142,6 @@ bool MakeStep::init()
ProjectExplorer::ProcessParameters *pp = processParameters(); ProjectExplorer::ProcessParameters *pp = processParameters();
pp->setMacroExpander(bc->macroExpander()); pp->setMacroExpander(bc->macroExpander());
Utils::Environment environment = bc->environment();
pp->setEnvironment(environment);
QString workingDirectory; QString workingDirectory;
if (bc->subNodeBuild()) if (bc->subNodeBuild())
workingDirectory = bc->subNodeBuild()->buildDir(); workingDirectory = bc->subNodeBuild()->buildDir();
@@ -191,15 +188,25 @@ bool MakeStep::init()
if (!bc->defaultMakeTarget().isEmpty()) if (!bc->defaultMakeTarget().isEmpty())
Utils::QtcProcess::addArg(&args, bc->defaultMakeTarget()); Utils::QtcProcess::addArg(&args, bc->defaultMakeTarget());
} }
Utils::Environment env = bc->environment();
// -w option enables "Enter"/"Leaving directory" messages, which we need for detecting the // -w option enables "Enter"/"Leaving directory" messages, which we need for detecting the
// absolute file path // absolute file path
// FIXME doing this without the user having a way to override this is rather bad // FIXME doing this without the user having a way to override this is rather bad
// so we only do it for unix and if the user didn't override the make command // so we only do it for unix and if the user didn't override the make command
// but for now this is the least invasive change // but for now this is the least invasive change
if (toolchain // We also prepend "L" to the MAKEFLAGS, so that nmake / jom are less verbose
&& toolchain->targetAbi().binaryFormat() != ProjectExplorer::Abi::PEFormat ProjectExplorer::ToolChain *toolChain = bc->toolChain();
&& m_makeCmd.isEmpty()) if (toolChain && m_makeCmd.isEmpty()) {
if (toolChain->targetAbi().binaryFormat() != ProjectExplorer::Abi::PEFormat )
Utils::QtcProcess::addArg(&args, QLatin1String("-w")); Utils::QtcProcess::addArg(&args, QLatin1String("-w"));
if (toolChain->targetAbi().os() == ProjectExplorer::Abi::WindowsOS
&& toolChain->targetAbi().osFlavor() != ProjectExplorer::Abi::WindowsMSysFlavor) {
env.set("MAKEFLAGS", env.value("MAKEFLAGS").prepend("L"));
}
}
pp->setEnvironment(env);
setEnabled(true); setEnabled(true);
pp->setArguments(args); pp->setArguments(args);