diff options
| author | Eric Fiselier <eric@efcs.ca> | 2017-05-31 23:27:25 +0000 |
|---|---|---|
| committer | Eric Fiselier <eric@efcs.ca> | 2017-05-31 23:27:25 +0000 |
| commit | baa9198585459a7f7987fd64c8555ce85669b871 (patch) | |
| tree | c2fcc96be2e01110fcb05dcd4e726e6d057172c8 /libcxx | |
| parent | 6b737ddce76034e3b6dc1dfb33db7ccb897baefb (diff) | |
| download | bcm5719-llvm-baa9198585459a7f7987fd64c8555ce85669b871.tar.gz bcm5719-llvm-baa9198585459a7f7987fd64c8555ce85669b871.zip | |
Define -DNOMINMAX when running the tests on Windows
llvm-svn: 304372
Diffstat (limited to 'libcxx')
| -rw-r--r-- | libcxx/utils/libcxx/test/config.py | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/libcxx/utils/libcxx/test/config.py b/libcxx/utils/libcxx/test/config.py index 1bf2677a850..0fbc2cf4ea6 100644 --- a/libcxx/utils/libcxx/test/config.py +++ b/libcxx/utils/libcxx/test/config.py @@ -484,9 +484,13 @@ class Configuration(object): # Configure extra flags compile_flags_str = self.get_lit_conf('compile_flags', '') self.cxx.compile_flags += shlex.split(compile_flags_str) - # FIXME: Can we remove this? if self.is_windows: + # FIXME: Can we remove this? self.cxx.compile_flags += ['-D_CRT_SECURE_NO_WARNINGS'] + # Required so that tests using min/max don't fail on Windows, + # and so that those tests don't have to be changed to tolerate + # this insanity. + self.cxx.compile_flags += ['-DNOMINMAX'] def configure_default_compile_flags(self): # Try and get the std version from the command line. Fall back to |
