diff options
| author | Ryan Schmidt <ryandesign@macports.org> | 2018-04-06 08:15:01 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-04-06 08:15:01 (GMT) |
| commit | ccec031950b2c0cf1fa4895dc164807185823ccb (patch) | |
| tree | 0230e616f0fcbaf629ea3a664c5432dd96a75d32 /configure.py | |
| parent | 04ba59b2ad986bd5765b14c5b497ccb0a2e909d4 (diff) | |
| download | Ninja-ccec031950b2c0cf1fa4895dc164807185823ccb.zip Ninja-ccec031950b2c0cf1fa4895dc164807185823ccb.tar.gz Ninja-ccec031950b2c0cf1fa4895dc164807185823ccb.tar.bz2 | |
Honor CXXFLAGS in configure.py
Diffstat (limited to 'configure.py')
| -rwxr-xr-x | configure.py | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/configure.py b/configure.py index a443748..9e23a5a 100755 --- a/configure.py +++ b/configure.py @@ -256,7 +256,7 @@ configure_args = sys.argv[1:] if '--bootstrap' in configure_args: configure_args.remove('--bootstrap') n.variable('configure_args', ' '.join(configure_args)) -env_keys = set(['CXX', 'AR', 'CFLAGS', 'LDFLAGS']) +env_keys = set(['CXX', 'AR', 'CFLAGS', 'CXXFLAGS', '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 + '=' + pipes.quote(configure_env[k]) @@ -397,6 +397,10 @@ def shell_escape(str): if 'CFLAGS' in configure_env: cflags.append(configure_env['CFLAGS']) + ldflags.append(configure_env['CFLAGS']) +if 'CXXFLAGS' in configure_env: + cflags.append(configure_env['CXXFLAGS']) + ldflags.append(configure_env['CXXFLAGS']) n.variable('cflags', ' '.join(shell_escape(flag) for flag in cflags)) if 'LDFLAGS' in configure_env: ldflags.append(configure_env['LDFLAGS']) |