diff options
| author | Eric Fiselier <eric@efcs.ca> | 2017-05-07 23:19:14 +0000 |
|---|---|---|
| committer | Eric Fiselier <eric@efcs.ca> | 2017-05-07 23:19:14 +0000 |
| commit | ca40e602bfd8e87bfd773a18743f82fd96adc2bd (patch) | |
| tree | d9cbd7f1a406fd0039b72e0a8aaec8510fd48834 | |
| parent | 33fca46ec3868c9d840c9bdeb0a401ae8bf874a9 (diff) | |
| download | bcm5719-llvm-ca40e602bfd8e87bfd773a18743f82fd96adc2bd.tar.gz bcm5719-llvm-ca40e602bfd8e87bfd773a18743f82fd96adc2bd.zip | |
Actually remove the MSVC STL when linking and testing libc++ on Windows
llvm-svn: 302387
| -rw-r--r-- | libcxx/utils/libcxx/test/config.py | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/libcxx/utils/libcxx/test/config.py b/libcxx/utils/libcxx/test/config.py index 7f1ae851b9c..7bc6ad4172a 100644 --- a/libcxx/utils/libcxx/test/config.py +++ b/libcxx/utils/libcxx/test/config.py @@ -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() |
