Author: phosek
Date: Tue Jun 4 23:58:41 2019
New Revision: 362585
URL: http://llvm.org/viewvc/llvm-project?rev=362585&view=rev
Log:
[CMake][Fuchsia] Use libc++ ABIv2 for the first stage build
This also unifies flags between macOS and Linux builds.
Modified:
cfe/trunk/cmake/caches/Fuchsia.cmake
Modified: cfe/trunk/cmake/caches/Fuchsia.cmake
URL:
http://llvm.org/viewvc/llvm-project/cfe/trunk/cmake/caches/Fuchsia.cmake?rev=362585&r1=362584&r2=362585&view=diff
==============================================================================
--- cfe/trunk/cmake/caches/Fuchsia.cmake (original)
+++ cfe/trunk/cmake/caches/Fuchsia.cmake Tue Jun 4 23:58:41 2019
@@ -29,20 +29,21 @@ if(APPLE)
set(COMPILER_RT_ENABLE_IOS OFF CACHE BOOL "")
set(COMPILER_RT_ENABLE_TVOS OFF CACHE BOOL "")
set(COMPILER_RT_ENABLE_WATCHOS OFF CACHE BOOL "")
-elseif(UNIX)
- set(LIBUNWIND_ENABLE_SHARED OFF CACHE BOOL "")
- set(LIBUNWIND_USE_COMPILER_RT ON CACHE BOOL "")
- set(LIBUNWIND_INSTALL_LIBRARY OFF CACHE BOOL "")
- set(LIBCXXABI_USE_COMPILER_RT ON CACHE BOOL "")
- set(LIBCXXABI_ENABLE_SHARED OFF CACHE BOOL "")
- set(LIBCXXABI_USE_LLVM_UNWINDER ON CACHE BOOL "")
- set(LIBCXXABI_ENABLE_STATIC_UNWINDER ON CACHE BOOL "")
- set(LIBCXXABI_INSTALL_LIBRARY OFF CACHE BOOL "")
- set(LIBCXX_USE_COMPILER_RT ON CACHE BOOL "")
- set(LIBCXX_ENABLE_SHARED OFF CACHE BOOL "")
- set(LIBCXX_ENABLE_STATIC_ABI_LIBRARY ON 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 "")
+set(LIBCXX_ENABLE_STATIC_ABI_LIBRARY ON CACHE BOOL "")
+set(LIBCXX_USE_COMPILER_RT ON CACHE BOOL "")
+
if(BOOTSTRAP_CMAKE_SYSTEM_NAME)
set(target "${BOOTSTRAP_CMAKE_CXX_COMPILER_TARGET}")
if(STAGE2_LINUX_${target}_SYSROOT)
_______________________________________________
cfe-commits mailing list
cfe-commits@lists.llvm.org
https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
