diff --git a/clang/cmake/caches/Fuchsia-stage2.cmake b/clang/cmake/caches/Fuchsia-stage2.cmake --- a/clang/cmake/caches/Fuchsia-stage2.cmake +++ b/clang/cmake/caches/Fuchsia-stage2.cmake @@ -30,7 +30,9 @@ set(LLVM_USE_CRT_RELEASE "MT" CACHE STRING "") endif() -set(CLANG_DEFAULT_CXX_STDLIB libc++ CACHE STRING "") +if(NOT WIN32) + set(CLANG_DEFAULT_CXX_STDLIB libc++ CACHE STRING "") +endif() if(NOT APPLE) # TODO: Remove this once we switch to ld64.lld. set(CLANG_DEFAULT_LINKER lld CACHE STRING "") @@ -93,7 +95,6 @@ set(RUNTIMES_${target}_LIBCXX_ENABLE_FILESYSTEM OFF CACHE BOOL "") set(RUNTIMES_${target}_LIBCXX_ENABLE_ABI_LINKER_SCRIPT OFF CACHE BOOL "") set(RUNTIMES_${target}_LIBCXX_ENABLE_SHARED OFF CACHE BOOL "") - set(RUNTIMES_${target}_LIBCXX_NO_VCRUNTIME ON CACHE BOOL "") set(RUNTIMES_${target}_LLVM_ENABLE_RUNTIMES "compiler-rt;libcxx" CACHE STRING "") endif() diff --git a/clang/cmake/caches/Fuchsia.cmake b/clang/cmake/caches/Fuchsia.cmake --- a/clang/cmake/caches/Fuchsia.cmake +++ b/clang/cmake/caches/Fuchsia.cmake @@ -21,7 +21,9 @@ set(LLVM_USE_CRT_RELEASE "MT" CACHE STRING "") endif() -set(CLANG_DEFAULT_CXX_STDLIB libc++ CACHE STRING "") +if(NOT WIN32) + set(CLANG_DEFAULT_CXX_STDLIB libc++ CACHE STRING "") +endif() if(NOT APPLE) # TODO: Remove this once we switch to ld64.lld. set(CLANG_DEFAULT_LINKER lld CACHE STRING "") @@ -66,7 +68,6 @@ set(LIBCXX_ENABLE_FILESYSTEM OFF CACHE BOOL "") set(LIBCXX_ENABLE_ABI_LINKER_SCRIPT OFF CACHE BOOL "") set(LIBCXX_ENABLE_STATIC_ABI_LIBRARY OFF CACHE BOOL "") - set(LIBCXX_NO_VCRUNTIME ON CACHE BOOL "") set(BUILTINS_CMAKE_ARGS -DCMAKE_SYSTEM_NAME=Windows CACHE STRING "") set(RUNTIMES_CMAKE_ARGS -DCMAKE_SYSTEM_NAME=Windows CACHE STRING "") set(LLVM_ENABLE_RUNTIMES "compiler-rt;libcxx" CACHE STRING "")