diff options
| author | Eric Fiselier <eric@efcs.ca> | 2017-01-05 08:07:17 +0000 |
|---|---|---|
| committer | Eric Fiselier <eric@efcs.ca> | 2017-01-05 08:07:17 +0000 |
| commit | 72c5d90a052aa43e29748f51e7bbb910f3d87240 (patch) | |
| tree | 8bc05db037804488e9026c2dddf73d2401fabf3e | |
| parent | 95aa265a6e00abcf6821ed20130fbbb723fee7a8 (diff) | |
| download | bcm5719-llvm-72c5d90a052aa43e29748f51e7bbb910f3d87240.tar.gz bcm5719-llvm-72c5d90a052aa43e29748f51e7bbb910f3d87240.zip | |
Get tests linking on Windows.
This patch is a temporary hack to get the tests passing on
Windows.
llvm-svn: 291091
| -rw-r--r-- | libcxx/test/libcxx/test/config.py | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/libcxx/test/libcxx/test/config.py b/libcxx/test/libcxx/test/config.py index 40defdff51a..7043b8a01c4 100644 --- a/libcxx/test/libcxx/test/config.py +++ b/libcxx/test/libcxx/test/config.py @@ -386,6 +386,9 @@ 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: + self.cxx.compile_flags += ['-D_CRT_SECURE_NO_WARNINGS'] def configure_default_compile_flags(self): # Try and get the std version from the command line. Fall back to @@ -572,6 +575,9 @@ class Configuration(object): # Configure libraries if self.cxx_stdlib_under_test == 'libc++': self.cxx.link_flags += ['-nodefaultlibs'] + # FIXME: Handle MSVCRT as part of the ABI library handling. + if self.is_windows: + self.cxx.link_flags += ['-nostdlib', '-lmsvcrtd'] self.configure_link_flags_cxx_library() self.configure_link_flags_abi_library() self.configure_extra_library_flags() |

