[libcxx-commits] [libcxx] 56b6e4e - [libc++] Also build the static library in the Apple cache

[Louis Dionne via libcxx-commits]

Author: Louis Dionne
Date: 2021-06-03T18:15:20-04:00
New Revision: 56b6e4e2dfa932ddc0cbfecaab07ddf4ebfefc10

URL: https://github.com/llvm/llvm-project/commit/56b6e4e2dfa932ddc0cbfecaab07ddf4ebfefc10
DIFF: https://github.com/llvm/llvm-project/commit/56b6e4e2dfa932ddc0cbfecaab07ddf4ebfefc10.diff

LOG: [libc++] Also build the static library in the Apple cache

Added: 
    

Modified: 
    libcxx/cmake/caches/Apple.cmake

Removed: 
    


################################################################################
diff  --git a/libcxx/cmake/caches/Apple.cmake b/libcxx/cmake/caches/Apple.cmake
index 0c01bb77ce7b9..75b96b2a7ce22 100644
--- a/libcxx/cmake/caches/Apple.cmake
+++ b/libcxx/cmake/caches/Apple.cmake
@@ -5,13 +5,16 @@ set(LIBCXX_USE_COMPILER_RT ON CACHE BOOL "")
 set(LIBCXX_ENABLE_ASSERTIONS OFF CACHE BOOL "")
 set(LIBCXX_ABI_VERSION "1" CACHE STRING "")
 set(LIBCXX_ENABLE_EXPERIMENTAL_LIBRARY OFF CACHE BOOL "")
-set(LIBCXX_ENABLE_STATIC OFF CACHE BOOL "")
+set(LIBCXX_ENABLE_STATIC ON CACHE BOOL "")
 set(LIBCXX_ENABLE_SHARED ON CACHE BOOL "")
 set(LIBCXX_CXX_ABI libcxxabi CACHE STRING "")
 set(LIBCXX_HIDE_FROM_ABI_PER_TU_BY_DEFAULT ON CACHE BOOL "")
 set(LIBCXX_ENABLE_DEBUG_MODE_SUPPORT OFF CACHE BOOL "")
 set(LIBCXX_ENABLE_VENDOR_AVAILABILITY_ANNOTATIONS ON CACHE BOOL "")
 
+set(LIBCXX_HERMETIC_STATIC_LIBRARY ON CACHE BOOL "")
+set(LIBCXXABI_HERMETIC_STATIC_LIBRARY ON CACHE BOOL "")
+
 set(LIBCXXABI_ENABLE_PIC OFF CACHE BOOL "")
 set(LIBCXXABI_ENABLE_ASSERTIONS OFF CACHE BOOL "")
 set(LIBCXXABI_ENABLE_FORGIVING_DYNAMIC_CAST ON CACHE BOOL "")