lili/qt5
1
0
Fork 0
mirror of git://code.qt.io/qt/qt5.git synced 2026-05-04 10:16:39 +08:00
Code Issues Packages Projects Releases Wiki Activity

build: Do not clobber existing values of CL environment variable.

Browse Source 
Change-Id: I88708560e0885fefa149aec7bd9789e585a79d57
Reviewed-by: Marius Storm-Olsen <marius.storm-olsen@nokia.com>
This commit is contained in:
Friedemann Kleint
2012-04-04 17:09:53 +02:00
committed by Qt by Nokia
parent feb89e2305
commit 38adcf8077
1 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
build
View File

@@ -211,8 +211,13 @@ sub detect_configuration
# Use the /MP compiler option, if using nmake, to use all CPU threads when compiling # Use the /MP compiler option, if using nmake, to use all CPU threads when compiling
if ($exe =~ 'nmake') { if ($exe =~ 'nmake') {
use Env qw(@CL); my $cl = $ENV{'CL'};
unshift @CL, '/MP'; if (defined $cl) {
$cl .= ' /MP';
} else {
$cl = '/MP';
}
$ENV{'CL'} = $cl;
} }
$self->{'MAKE'} = "\"$exe\"" if (defined $exe); $self->{'MAKE'} = "\"$exe\"" if (defined $exe);