diff options
| author | Nico Weber <nicolasweber@gmx.de> | 2014-09-19 16:30:00 (GMT) |
|---|---|---|
| committer | Nico Weber <nicolasweber@gmx.de> | 2014-09-19 16:30:00 (GMT) |
| commit | 165b6d189c916ba1a2c19b5b193829b691150a65 (patch) | |
| tree | 2ecd5c1807a2cd55e825a6b3e162389f422b4ae3 | |
| parent | 0d6a4e920b1b91d7837335e7fbbe9014d5b316a4 (diff) | |
| parent | 13dfea4f8ddb38dae127e023d5d25292c4fefb14 (diff) | |
| download | Ninja-165b6d189c916ba1a2c19b5b193829b691150a65.zip Ninja-165b6d189c916ba1a2c19b5b193829b691150a65.tar.gz Ninja-165b6d189c916ba1a2c19b5b193829b691150a65.tar.bz2 | |
Merge pull request #823 from nico/conf
Make auto-reconfiguring work if CFLAGS contains more than one flag.
| -rwxr-xr-x | configure.py | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/configure.py b/configure.py index a307043..01fd301 100755 --- a/configure.py +++ b/configure.py @@ -23,6 +23,7 @@ from __future__ import print_function from optparse import OptionParser import os +import pipes import sys import platform_helper sys.path.insert(0, 'misc') @@ -77,7 +78,8 @@ n.variable('configure_args', ' '.join(sys.argv[1:])) env_keys = set(['CXX', 'AR', 'CFLAGS', 'LDFLAGS']) configure_env = dict((k, os.environ[k]) for k in os.environ if k in env_keys) if configure_env: - config_str = ' '.join([k + '=' + configure_env[k] for k in configure_env]) + config_str = ' '.join([k + '=' + pipes.quote(configure_env[k]) + for k in configure_env]) n.variable('configure_env', config_str + '$ ') n.newline() |