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

This reverts commit r302387.

git-svn-id: https://llvm.org/svn/llvm-project/libcxx/trunk@302389 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Eric Fiselier
2017-05-07 23:37:38 +00:00
parent 04da0e13a3
commit 46795cca2b

View File

@@ -698,11 +698,7 @@ class Configuration(object):
self.cxx.link_flags += ['-nodefaultlibs']
# FIXME: Handle MSVCRT as part of the ABI library handling.
if self.is_windows:
# 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.cxx.link_flags += ['-nostdlib']
self.configure_link_flags_cxx_library()
self.configure_link_flags_abi_library()
self.configure_extra_library_flags()