From 0d5af7a4caaf19ff97ca90e9ca7f2b78a858ab07 Mon Sep 17 00:00:00 2001 From: Petr Hosek Date: Fri, 11 Jun 2021 00:43:27 -0700 Subject: [PATCH] Revert "[CMake] Don't use libc++ by default on Windows yet" This reverts commit b413e44200e715c254fa9a41f6a86f8761c9b362. --- clang/cmake/caches/Fuchsia-stage2.cmake | 4 +--- clang/cmake/caches/Fuchsia.cmake | 4 +--- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/clang/cmake/caches/Fuchsia-stage2.cmake b/clang/cmake/caches/Fuchsia-stage2.cmake index bc955b1..85d96bc 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 bb88ff7..babc14e5 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 "") -- 2.7.4