diff options
author | Friedemann Kleint <Friedemann.Kleint@nokia.com> | 2012-04-04 17:09:53 +0200 |
---|---|---|
committer | Qt by Nokia <qt-info@nokia.com> | 2012-04-04 18:33:30 +0200 |
commit | 38adcf80779ccc8cadb7f2e17db988eae1503709 (patch) | |
tree | 1fe701cd11254869376783602d44e37b2d74e721 /build | |
parent | feb89e2305c7c378fe2ccb12f60e199822376f90 (diff) |
build: Do not clobber existing values of CL environment variable.
Change-Id: I88708560e0885fefa149aec7bd9789e585a79d57
Reviewed-by: Marius Storm-Olsen <marius.storm-olsen@nokia.com>
Diffstat (limited to 'build')
-rwxr-xr-x | build | 9 |
1 files changed, 7 insertions, 2 deletions
@@ -211,8 +211,13 @@ sub detect_configuration # Use the /MP compiler option, if using nmake, to use all CPU threads when compiling if ($exe =~ 'nmake') { - use Env qw(@CL); - unshift @CL, '/MP'; + my $cl = $ENV{'CL'}; + if (defined $cl) { + $cl .= ' /MP'; + } else { + $cl = '/MP'; + } + $ENV{'CL'} = $cl; } $self->{'MAKE'} = "\"$exe\"" if (defined $exe); |