diff options
| author | Eric Fiselier <eric@efcs.ca> | 2017-05-07 23:37:38 +0000 |
|---|---|---|
| committer | Eric Fiselier <eric@efcs.ca> | 2017-05-07 23:37:38 +0000 |
| commit | 10cb6ca12b085a517d9a268a40109a6da0186ad4 (patch) | |
| tree | c8f1d45fa0a0aac3cc465e9fc7affb180fda07dc /libcxx/utils | |
| parent | 300831c0c4b0d58a09379107ccaf7999f5493e04 (diff) | |
| download | bcm5719-llvm-10cb6ca12b085a517d9a268a40109a6da0186ad4.tar.gz bcm5719-llvm-10cb6ca12b085a517d9a268a40109a6da0186ad4.zip | |
Revert "Actually remove the MSVC STL when linking and testing libc++ on Windows"
This reverts commit r302387.
llvm-svn: 302389
Diffstat (limited to 'libcxx/utils')
| -rw-r--r-- | libcxx/utils/libcxx/test/config.py | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/libcxx/utils/libcxx/test/config.py b/libcxx/utils/libcxx/test/config.py index 7bc6ad4172a..7f1ae851b9c 100644 --- a/libcxx/utils/libcxx/test/config.py +++ b/libcxx/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() |
