From 38adcf80779ccc8cadb7f2e17db988eae1503709 Mon Sep 17 00:00:00 2001
From: Friedemann Kleint <Friedemann.Kleint@nokia.com>
Date: Wed, 4 Apr 2012 17:09:53 +0200
Subject: build: Do not clobber existing values of CL environment variable.

Change-Id: I88708560e0885fefa149aec7bd9789e585a79d57
Reviewed-by: Marius Storm-Olsen <marius.storm-olsen@nokia.com>
---
 build | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

(limited to 'build')

diff --git a/build b/build
index 17be3e9a..02014a72 100755
--- a/build
+++ b/build
@@ -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);
-- 
cgit v1.2.3