maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

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

This reverts commit r302387.

llvm-svn: 302389
This commit is contained in:
Eric Fiselier 2017-05-07 23:37:38 +00:00
parent 300831c0c4
commit 10cb6ca12b
1 changed files with 1 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libcxx/utils/libcxx/test/config.py
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()