diff options
| author | Evan Martin <martine@danga.com> | 2011-09-08 01:48:41 (GMT) |
|---|---|---|
| committer | Evan Martin <martine@danga.com> | 2011-09-08 01:48:41 (GMT) |
| commit | e0fb5ba60bb7c3a9f4e4a4e5ea6a16f1010cb59e (patch) | |
| tree | 248cb7fed23b257be840d2cc4706cd459136152a /configure.py | |
| parent | 4a6d00e978409620079bf89161ecc5aad024fe03 (diff) | |
| parent | 7a3dd0d534e7be3e8c8a57917e66c73b4e8a9ba0 (diff) | |
| download | Ninja-e0fb5ba60bb7c3a9f4e4a4e5ea6a16f1010cb59e.zip Ninja-e0fb5ba60bb7c3a9f4e4a4e5ea6a16f1010cb59e.tar.gz Ninja-e0fb5ba60bb7c3a9f4e4a4e5ea6a16f1010cb59e.tar.bz2 | |
Merge branch 'master' of github.com:martine/ninja
Conflicts:
configure.py
Diffstat (limited to 'configure.py')
| -rwxr-xr-x | configure.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/configure.py b/configure.py index 778d581..b680a8c 100755 --- a/configure.py +++ b/configure.py @@ -172,9 +172,9 @@ else: test_libs = libs + ['-lgtest_main', '-lgtest'] objs = [] -for name in ['build_test', 'build_log_test', 'graph_test', 'ninja_test', - 'parsers_test', 'subprocess_test', 'util_test', 'clean_test', - 'test']: +for name in ['build_test', 'build_log_test', 'disk_interface_test', + 'graph_test', 'ninja_test', 'parsers_test', 'subprocess_test', + 'util_test', 'clean_test', 'test']: objs += cxx(name, variables=[('cflags', test_cflags)]) if platform != 'mingw': |