From 46795cca2bc47ee4c338b2e181cac5193dec5e92 Mon Sep 17 00:00:00 2001 From: Eric Fiselier Date: Sun, 7 May 2017 23:37:38 +0000 Subject: [PATCH] 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 --- utils/libcxx/test/config.py | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/utils/libcxx/test/config.py b/utils/libcxx/test/config.py index 7bc6ad417..7f1ae851b 100644 --- a/utils/libcxx/test/config.py +++ b/utils/libcxx/test/config.py @@ -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()