diff options
| -rw-r--r-- | appveyor.yml | 14 | ||||
| -rwxr-xr-x | configure.py | 6 |
2 files changed, 19 insertions, 1 deletions
diff --git a/appveyor.yml b/appveyor.yml new file mode 100644 index 0000000..c8e1a9d --- /dev/null +++ b/appveyor.yml @@ -0,0 +1,14 @@ +version: 1.0.{build} +image: Visual Studio 2017 +build_script: +- cmd: >- + call "C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Auxiliary\Build\vcvars64.bat" + + python configure.py --bootstrap + + ninja.bootstrap.exe all + + ninja_test + + python misc/ninja_syntax_test.py +test: off 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']) |