llvm/libcxx
1
0
Fork 0
mirror of https://github.com/llvm-mirror/libcxx.git synced 2025-10-24 03:32:35 +08:00
Code Issues Packages Projects Releases Wiki Activity

Get tests linking on Windows.

Browse Source 
This patch is a temporary hack to get the tests passing on
Windows.

git-svn-id: https://llvm.org/svn/llvm-project/libcxx/trunk@291091 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Eric Fiselier
2017-01-05 08:07:17 +00:00
parent 856712bda2
commit 20f0c0f3a6
1 changed files with 6 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
test/libcxx/test/config.py
View File

@@ -386,6 +386,9 @@ class Configuration(object):
# Configure extra flags # Configure extra flags
compile_flags_str = self.get_lit_conf('compile_flags', '') compile_flags_str = self.get_lit_conf('compile_flags', '')
self.cxx.compile_flags += shlex.split(compile_flags_str) 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): def configure_default_compile_flags(self):
# Try and get the std version from the command line. Fall back to # Try and get the std version from the command line. Fall back to
@@ -572,6 +575,9 @@ class Configuration(object):
# Configure libraries # Configure libraries
if self.cxx_stdlib_under_test == 'libc++': if self.cxx_stdlib_under_test == 'libc++':
self.cxx.link_flags += ['-nodefaultlibs'] 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_cxx_library()
self.configure_link_flags_abi_library() self.configure_link_flags_abi_library()
self.configure_extra_library_flags() self.configure_extra_library_flags()