[clang] 0d5af7a - Revert "[CMake] Don't use libc++ by default on Windows yet"

Petr Hosek via cfe-commits cfe-commits at lists.llvm.org
Fri Jun 11 00:46:23 PDT 2021


Author: Petr Hosek
Date: 2021-06-11T00:45:49-07:00
New Revision: 0d5af7a4caaf19ff97ca90e9ca7f2b78a858ab07

URL: https://github.com/llvm/llvm-project/commit/0d5af7a4caaf19ff97ca90e9ca7f2b78a858ab07
DIFF: https://github.com/llvm/llvm-project/commit/0d5af7a4caaf19ff97ca90e9ca7f2b78a858ab07.diff

LOG: Revert "[CMake] Don't use libc++ by default on Windows yet"

This reverts commit b413e44200e715c254fa9a41f6a86f8761c9b362.

Added: 
    

Modified: 
    clang/cmake/caches/Fuchsia-stage2.cmake
    clang/cmake/caches/Fuchsia.cmake

Removed: 
    


################################################################################
diff  --git a/clang/cmake/caches/Fuchsia-stage2.cmake b/clang/cmake/caches/Fuchsia-stage2.cmake
index bc955b17c130e..85d96bc52d529 100644
--- 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 bb88ff7e72cd9..babc14e51a8da 100644
--- 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 "")


        


More information about the cfe-commits mailing list