projects / platform / upstream / llvm.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: f3f9045)
Revert "[CMake] Don't use libc++ by default on Windows yet"
authorPetr Hosek <phosek@google.com>
Fri, 11 Jun 2021 07:43:27 +0000 (00:43 -0700)
committerPetr Hosek <phosek@google.com>
Fri, 11 Jun 2021 07:45:49 +0000 (00:45 -0700)
This reverts commit b413e44200e715c254fa9a41f6a86f8761c9b362.

clang/cmake/caches/Fuchsia-stage2.cmake patch | blob | history
clang/cmake/caches/Fuchsia.cmake patch | blob | history

diff --git a/clang/cmake/caches/Fuchsia-stage2.cmake b/clang/cmake/caches/Fuchsia-stage2.cmake
index bc955b1..85d96bc 100644 (file)
--- a/clang/cmake/caches/Fuchsia-stage2.cmake
+++ b/clang/cmake/caches/Fuchsia-stage2.cmake
@@ -30,9 +30,7 @@ if(WIN32)
   set(LLVM_USE_CRT_RELEASE "MT" CACHE STRING "")
 endif()
 
-if(NOT WIN32)
-  set(CLANG_DEFAULT_CXX_STDLIB libc++ CACHE STRING "")
-endif()
+set(CLANG_DEFAULT_CXX_STDLIB libc++ CACHE STRING "")
 if(NOT APPLE)
   # TODO: Remove this once we switch to ld64.lld.
   set(CLANG_DEFAULT_LINKER lld CACHE STRING "")
diff --git a/clang/cmake/caches/Fuchsia.cmake b/clang/cmake/caches/Fuchsia.cmake
index bb88ff7..babc14e 100644 (file)
--- a/clang/cmake/caches/Fuchsia.cmake
+++ b/clang/cmake/caches/Fuchsia.cmake
@@ -21,9 +21,7 @@ if(WIN32)
   set(LLVM_USE_CRT_RELEASE "MT" CACHE STRING "")
 endif()
 
-if(NOT WIN32)
-  set(CLANG_DEFAULT_CXX_STDLIB libc++ CACHE STRING "")
-endif()
+set(CLANG_DEFAULT_CXX_STDLIB libc++ CACHE STRING "")
 if(NOT APPLE)
   # TODO: Remove this once we switch to ld64.lld.
   set(CLANG_DEFAULT_LINKER lld CACHE STRING "")
Domain: System / Toolchain;