diff options
| author | Evan Martin <martine@danga.com> | 2012-04-30 16:21:32 (GMT) |
|---|---|---|
| committer | Evan Martin <martine@danga.com> | 2012-04-30 16:21:32 (GMT) |
| commit | 69f465ed845e9a4e652435a31f09f2ca537f6f54 (patch) | |
| tree | 76562d67ec0f64485bd0fd31c696af852a0662ba /configure.py | |
| parent | 3e9cb5d72ae6ea6faab4b7bdb7781d130590e799 (diff) | |
| parent | 3e3abfe97f4c7cdb863e5c45dc3c7d0df6299871 (diff) | |
| download | Ninja-69f465ed845e9a4e652435a31f09f2ca537f6f54.zip Ninja-69f465ed845e9a4e652435a31f09f2ca537f6f54.tar.gz Ninja-69f465ed845e9a4e652435a31f09f2ca537f6f54.tar.bz2 | |
Merge pull request #287 from nico/gtestnortti
Fix ninja_test build with clang, build without rtti on windows.
Diffstat (limited to 'configure.py')
| -rwxr-xr-x | configure.py | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/configure.py b/configure.py index c35cf6f..dc727e8 100755 --- a/configure.py +++ b/configure.py @@ -103,7 +103,7 @@ else: if platform == 'windows': cflags = ['/nologo', '/Zi', '/W4', '/WX', '/wd4530', '/wd4100', '/wd4706', - '/wd4512', '/wd4800', '/wd4702', '/wd4819', + '/wd4512', '/wd4800', '/wd4702', '/wd4819', '/GR-', '/DNOMINMAX', '/D_CRT_SECURE_NO_WARNINGS', "/DNINJA_PYTHON=\"%s\"" % (options.with_python,)] ldflags = ['/DEBUG', '/libpath:$builddir'] @@ -271,7 +271,8 @@ if options.with_gtest: os.path.join(path, 'src/gtest_main.cc'), variables=[('cflags', gtest_cflags)]) - test_cflags = cflags + ['-I%s' % os.path.join(path, 'include')] + test_cflags = cflags + ['-DGTEST_HAS_RTTI=0', + '-I%s' % os.path.join(path, 'include')] elif platform == 'windows': test_libs.extend(['gtest_main.lib', 'gtest.lib']) else: |