configure.py: make CC='command with args' work

cjhopman · Jan 9, 2012 · 5f56ff1 · 5f56ff1
1 parent d9373ff
commit 5f56ff1
Showing 1 changed file with 5 additions and 3 deletions.
diff --git a/bootstrap.py b/bootstrap.py
@@ -17,6 +17,7 @@
 import os
 import glob
 import errno
+import shlex
 import subprocess
 
 def run(*args, **kwargs):
@@ -66,9 +67,10 @@ def run(*args, **kwargs):
 if vcdir:
     args = [os.path.join(vcdir, 'bin', 'cl.exe'), '/nologo', '/EHsc', '/DWIN32']
 else:
-    args = [os.environ.get('CXX', 'g++'), '-Wno-deprecated',
-            '-DNINJA_PYTHON="' + sys.executable + '"',
-            '-DNINJA_BOOTSTRAP']
+    args = shlex.split(os.environ.get('CXX', 'g++'))
+    args.extend(['-Wno-deprecated',
+                 '-DNINJA_PYTHON="' + sys.executable + '"',
+                 '-DNINJA_BOOTSTRAP'])
 args.extend(cflags)
 args.extend(ldflags)
 binary = 'ninja.bootstrap'