Author: Petr Hosek Date: 2021-11-11T19:29:39-08:00 New Revision: 8df26e7b4aeaad0b1777c6909db7b14fec347880
URL: https://github.com/llvm/llvm-project/commit/8df26e7b4aeaad0b1777c6909db7b14fec347880 DIFF: https://github.com/llvm/llvm-project/commit/8df26e7b4aeaad0b1777c6909db7b14fec347880.diff LOG: [Fuchsia][CMake] Don't set libcxxabi and libunwind variables on Windows We don't build libcxxabi and libunwind for Windows so don't set the corresponding variables to avoid configuration errors. Differential Revision: https://reviews.llvm.org/D113729 Added: Modified: clang/cmake/caches/Fuchsia.cmake Removed: ################################################################################ diff --git a/clang/cmake/caches/Fuchsia.cmake b/clang/cmake/caches/Fuchsia.cmake index a98354b7782fc..a531f9f1c10d8 100644 --- a/clang/cmake/caches/Fuchsia.cmake +++ b/clang/cmake/caches/Fuchsia.cmake @@ -49,26 +49,26 @@ if(APPLE) set(COMPILER_RT_ENABLE_WATCHOS OFF CACHE BOOL "") endif() -set(LIBUNWIND_ENABLE_SHARED OFF CACHE BOOL "") -set(LIBUNWIND_INSTALL_LIBRARY OFF CACHE BOOL "") -set(LIBUNWIND_USE_COMPILER_RT ON CACHE BOOL "") -set(LIBCXXABI_ENABLE_SHARED OFF CACHE BOOL "") -set(LIBCXXABI_ENABLE_STATIC_UNWINDER ON CACHE BOOL "") -set(LIBCXXABI_INSTALL_LIBRARY OFF CACHE BOOL "") -set(LIBCXXABI_USE_COMPILER_RT ON CACHE BOOL "") -set(LIBCXXABI_USE_LLVM_UNWINDER ON CACHE BOOL "") -set(LIBCXX_ABI_VERSION 2 CACHE STRING "") -set(LIBCXX_ENABLE_SHARED OFF CACHE BOOL "") if(WIN32) - set(LIBCXX_HAS_WIN32_THREAD_API ON CACHE BOOL "") + set(LIBCXX_ABI_VERSION 2 CACHE STRING "") set(LIBCXX_ENABLE_EXPERIMENTAL_LIBRARY OFF CACHE BOOL "") 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_ENABLE_SHARED OFF 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 "") else() + set(LIBUNWIND_ENABLE_SHARED OFF CACHE BOOL "") + set(LIBUNWIND_INSTALL_LIBRARY OFF CACHE BOOL "") + set(LIBUNWIND_USE_COMPILER_RT ON CACHE BOOL "") + set(LIBCXXABI_ENABLE_SHARED OFF CACHE BOOL "") + set(LIBCXXABI_ENABLE_STATIC_UNWINDER ON CACHE BOOL "") + set(LIBCXXABI_INSTALL_LIBRARY OFF CACHE BOOL "") + set(LIBCXXABI_USE_COMPILER_RT ON CACHE BOOL "") + set(LIBCXXABI_USE_LLVM_UNWINDER ON CACHE BOOL "") + set(LIBCXX_ABI_VERSION 2 CACHE STRING "") + set(LIBCXX_ENABLE_SHARED OFF CACHE BOOL "") set(LIBCXX_ENABLE_STATIC_ABI_LIBRARY ON CACHE BOOL "") set(LLVM_ENABLE_RUNTIMES "compiler-rt;libcxx;libcxxabi;libunwind" CACHE STRING "") endif() _______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
