[libcxx] r302387 - Actually remove the MSVC STL when linking and testing libc++ on Windows

[Eric Fiselier via cfe-commits]

Author: ericwf
Date: Sun May  7 18:19:14 2017
New Revision: 302387

URL: http://llvm.org/viewvc/llvm-project?rev=302387&view=rev
Log:
Actually remove the MSVC STL when linking and testing libc++ on Windows

Modified:
    libcxx/trunk/utils/libcxx/test/config.py

Modified: libcxx/trunk/utils/libcxx/test/config.py
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/utils/libcxx/test/config.py?rev=302387&r1=302386&r2=302387&view=diff
==============================================================================
--- libcxx/trunk/utils/libcxx/test/config.py (original)
+++ libcxx/trunk/utils/libcxx/test/config.py Sun May  7 18:19:14 2017
@@ -698,7 +698,11 @@ class Configuration(object):
                 self.cxx.link_flags += ['-nodefaultlibs']
                 # FIXME: Handle MSVCRT as part of the ABI library handling.
                 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_abi_library()
                 self.configure_extra_library_flags()