Actually remove the MSVC STL when linking and testing libc++ on Windows

llvm-svn: 302387
This commit is contained in:
Eric Fiselier 2017-05-07 23:19:14 +00:00
parent 33fca46ec3
commit ca40e602bf
1 changed files with 5 additions and 1 deletions

View File

@ -698,7 +698,11 @@ class Configuration(object):
self.cxx.link_flags += ['-nodefaultlibs'] self.cxx.link_flags += ['-nodefaultlibs']
# FIXME: Handle MSVCRT as part of the ABI library handling. # FIXME: Handle MSVCRT as part of the ABI library handling.
if self.is_windows: if self.is_windows:
self.cxx.link_flags += ['-nostdlib'] # Prevent the MSVC STL from getting linked into the program.
self.cxx.link_flags += ['-Wl,-nodefaultlib:msvcprt',
'-Wl,-nodefaultlib:msvcprtd',
'-Wl,-nodefaultlib:libcpmt',
'-Wl,-nodefaultlib:libcpmtd']
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()