Author: Petr Hosek Date: 2022-05-18T18:14:42Z New Revision: e64722f686bd8a6d0c2c099ce6fb90e84f51341d
URL: https://github.com/llvm/llvm-project/commit/e64722f686bd8a6d0c2c099ce6fb90e84f51341d DIFF: https://github.com/llvm/llvm-project/commit/e64722f686bd8a6d0c2c099ce6fb90e84f51341d.diff LOG: [CMake][Fuchsia] Build runtimes as universal libraries on OS X We want to build libunwind, libc++abi and libc++ as universal libraries supporting both x86_64 and arm64 architectures. Differential Revision: https://reviews.llvm.org/D125908 Added: Modified: clang/cmake/caches/Fuchsia-stage2.cmake clang/cmake/caches/Fuchsia.cmake Removed: ################################################################################ diff --git a/clang/cmake/caches/Fuchsia-stage2.cmake b/clang/cmake/caches/Fuchsia-stage2.cmake index 5d9257951e71d..6a00556e977f4 100644 --- a/clang/cmake/caches/Fuchsia-stage2.cmake +++ b/clang/cmake/caches/Fuchsia-stage2.cmake @@ -61,10 +61,11 @@ if(APPLE) 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_USE_COMPILER_RT 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_ABI_VERSION 2 CACHE STRING "") + set(LIBCXX_USE_COMPILER_RT ON CACHE BOOL "") + set(RUNTIMES_CMAKE_ARGS "-DCMAKE_OSX_DEPLOYMENT_TARGET=10.13;-DCMAKE_OSX_ARCHITECTURES=arm64|x86_64" CACHE STRING "") endif() if(WIN32) diff --git a/clang/cmake/caches/Fuchsia.cmake b/clang/cmake/caches/Fuchsia.cmake index f7b51d5861335..7b534e61f9520 100644 --- a/clang/cmake/caches/Fuchsia.cmake +++ b/clang/cmake/caches/Fuchsia.cmake @@ -69,7 +69,9 @@ else() 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 "") set(LLVM_ENABLE_RUNTIMES "compiler-rt;libcxx;libcxxabi;libunwind" CACHE STRING "") + set(RUNTIMES_CMAKE_ARGS "-DCMAKE_OSX_DEPLOYMENT_TARGET=10.13;-DCMAKE_OSX_ARCHITECTURES=arm64|x86_64" CACHE STRING "") endif() if(BOOTSTRAP_CMAKE_SYSTEM_NAME) _______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits