diff options
| author | Petr Hosek <phosek@google.com> | 2021-06-02 14:17:16 -0700 |
|---|---|---|
| committer | Petr Hosek <phosek@google.com> | 2021-06-02 14:56:27 -0700 |
| commit | b5dd421a3afa02907777fddf61073274e2a4aa9a (patch) | |
| tree | bc01475876abef18eddd26b0ed7a2eab8c5b6233 /clang/cmake | |
| parent | b73a1e67782bb56552c0f343cebe93985a85293d (diff) | |
| download | llvm-b5dd421a3afa02907777fddf61073274e2a4aa9a.tar.gz | |
[Fuchsia] Use libc++abi on Windows in Fuchsia toolchain
Don't use vcruntime, this makes our toolchain more hermetic and avoids
some compiler errors we've encountered in compiler-rt.
Differential Revision: https://reviews.llvm.org/D103555
Diffstat (limited to 'clang/cmake')
| -rw-r--r-- | clang/cmake/caches/Fuchsia-stage2.cmake | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/clang/cmake/caches/Fuchsia-stage2.cmake b/clang/cmake/caches/Fuchsia-stage2.cmake index 7a3853f9e7aa..982307732327 100644 --- a/clang/cmake/caches/Fuchsia-stage2.cmake +++ b/clang/cmake/caches/Fuchsia-stage2.cmake @@ -83,12 +83,15 @@ if(WIN32) list(APPEND RUNTIME_TARGETS "${target}") set(RUNTIMES_${target}_CMAKE_SYSTEM_NAME Windows CACHE STRING "") set(RUNTIMES_${target}_CMAKE_BUILD_TYPE RelWithDebInfo CACHE STRING "") + set(RUNTIMES_${target}_LIBCXXABI_ENABLE_SHARED OFF CACHE BOOL "") set(RUNTIMES_${target}_LIBCXX_ABI_VERSION 2 CACHE STRING "") + set(RUNTIMES_${target}_LIBCXX_CXX_ABI "libcxxabi" CACHE STRING "") set(RUNTIMES_${target}_LIBCXX_ENABLE_EXPERIMENTAL_LIBRARY OFF CACHE BOOL "") 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}_LLVM_ENABLE_RUNTIMES "compiler-rt;libcxx" CACHE STRING "") + set(RUNTIMES_${target}_LIBCXX_NO_VCRUNTIME ON CACHE BOOL "") + set(RUNTIMES_${target}_LLVM_ENABLE_RUNTIMES "compiler-rt;libcxx;libcxxabi" CACHE STRING "") endif() foreach(target aarch64-unknown-linux-gnu;armv7-unknown-linux-gnueabihf;i386-unknown-linux-gnu;x86_64-unknown-linux-gnu) |