1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

add /nologo to jom calls as well

Browse Source 
Change-Id: I7de0483ae17377d6682a4279ff3914aa78fc11a9
Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
This commit is contained in:
Oswald Buddenhagen 2015-02-05 18:07:03 +01:00
parent 3c5f39b1ec
commit f59e2fe849
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
tools/configure/configureapp.cpp
View File

@ -3181,7 +3181,7 @@ void Configure::detectArch()
// compile // compile
command = dictionary[ "MAKE" ]; command = dictionary[ "MAKE" ];
if (command.contains("nmake")) if (command.contains("nmake") || command.contains("jom"))
command += " /NOLOGO"; command += " /NOLOGO";
command += " -s"; command += " -s";
Environment::execute(command); Environment::execute(command);
@ -3286,7 +3286,7 @@ bool Configure::tryCompileProject(const QString &projectPath, const QString &ext
if (code == 0) { if (code == 0) {
// compile // compile
command = dictionary[ "MAKE" ]; command = dictionary[ "MAKE" ];
if (command.contains("nmake")) if (command.contains("nmake") || command.contains("jom"))
command += " /NOLOGO"; command += " /NOLOGO";
command += " -s 2>&1"; command += " -s 2>&1";
output = Environment::execute(command, &code); output = Environment::execute(command, &code);