Author: ericwf
Date: Sun May 7 18:37:38 2017
New Revision: 302389
URL: http://llvm.org/viewvc/llvm-project?rev=302389&view=rev
Log:
Revert "Actually remove the MSVC STL when linking and testing libc++ on Windows"
This reverts commit r302387.
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=302389&r1=302388&r2=302389&view=diff
==============================================================================
--- libcxx/trunk/utils/libcxx/test/config.py (original)
+++ libcxx/trunk/utils/libcxx/test/config.py Sun May 7 18:37:38 2017
@@ -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()
_______________________________________________
cfe-commits mailing list
cfe-commits@lists.llvm.org
http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
