[libcxx-commits] [libcxx] r371638 - [libc++] Add a CMake cache for Apple-specific configuration options

[Louis Dionne via libcxx-commits]

Author: ldionne
Date: Wed Sep 11 09:57:19 2019
New Revision: 371638

URL: http://llvm.org/viewvc/llvm-project?rev=371638&view=rev
Log:
[libc++] Add a CMake cache for Apple-specific configuration options

Added:
    libcxx/trunk/cmake/caches/
    libcxx/trunk/cmake/caches/Apple.cmake
Modified:
    libcxx/trunk/utils/ci/macos-backdeployment.sh
    libcxx/trunk/utils/ci/macos-trunk.sh

Added: libcxx/trunk/cmake/caches/Apple.cmake
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/cmake/caches/Apple.cmake?rev=371638&view=auto
==============================================================================
--- libcxx/trunk/cmake/caches/Apple.cmake (added)
+++ libcxx/trunk/cmake/caches/Apple.cmake Wed Sep 11 09:57:19 2019
@@ -0,0 +1,15 @@
+set(CMAKE_BUILD_TYPE MinSizeRel CACHE STRING "")
+set(CMAKE_POSITION_INDEPENDENT_CODE OFF CACHE BOOL "")
+
+set(LIBCXX_USE_COMPILER_RT ON CACHE BOOL "")
+set(LIBCXX_ENABLE_ASSERTIONS ON 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_NEW_DELETE_DEFINITIONS OFF CACHE BOOL "")
+set(LIBCXXABI_ENABLE_NEW_DELETE_DEFINITIONS ON CACHE BOOL "")
+
+set(LIBCXX_HIDE_FROM_ABI_PER_TU_BY_DEFAULT ON CACHE BOOL "")

Modified: libcxx/trunk/utils/ci/macos-backdeployment.sh
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/utils/ci/macos-backdeployment.sh?rev=371638&r1=371637&r2=371638&view=diff
==============================================================================
--- libcxx/trunk/utils/ci/macos-backdeployment.sh (original)
+++ libcxx/trunk/utils/ci/macos-backdeployment.sh Wed Sep 11 09:57:19 2019
@@ -103,10 +103,13 @@ echo "@@@@@@"
 echo "@@@ Configuring CMake @@@"
 mkdir -p "${LLVM_BUILD_DIR}"
 (cd "${LLVM_BUILD_DIR}" &&
-  xcrun cmake "${MONOREPO_ROOT}/llvm" -GNinja \
+  xcrun cmake \
+    -C "${MONOREPO_ROOT}/libcxx/cmake/caches/Apple.cmake" \
+    -GNinja \
     -DCMAKE_INSTALL_PREFIX="${LLVM_INSTALL_DIR}" \
     -DLLVM_ENABLE_PROJECTS="libcxx;libcxxabi" \
-    -DCMAKE_OSX_ARCHITECTURES="${CMAKE_ARCH_STRING}"
+    -DCMAKE_OSX_ARCHITECTURES="${CMAKE_ARCH_STRING}" \
+    "${MONOREPO_ROOT}/llvm"
 )
 echo "@@@@@@"
 

Modified: libcxx/trunk/utils/ci/macos-trunk.sh
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/utils/ci/macos-trunk.sh?rev=371638&r1=371637&r2=371638&view=diff
==============================================================================
--- libcxx/trunk/utils/ci/macos-trunk.sh (original)
+++ libcxx/trunk/utils/ci/macos-trunk.sh Wed Sep 11 09:57:19 2019
@@ -101,16 +101,17 @@ echo "@@@@@@"
 echo "@@@ Configuring CMake @@@"
 mkdir -p "${LLVM_BUILD_DIR}"
 (cd "${LLVM_BUILD_DIR}" &&
-  xcrun cmake "${MONOREPO_ROOT}/llvm" -GNinja \
+  xcrun cmake \
+    -C "${MONOREPO_ROOT}/libcxx/cmake/caches/Apple.cmake" \
+    -GNinja \
     -DCMAKE_INSTALL_PREFIX="${LLVM_INSTALL_DIR}" \
     -DLIBCXX_ENABLE_EXCEPTIONS="${LIBCXX_EXCEPTIONS}" \
-    -DLIBCXX_ENABLE_NEW_DELETE_DEFINITIONS=OFF \
     -DLIBCXXABI_ENABLE_EXCEPTIONS=ON \
-    -DLIBCXXABI_ENABLE_NEW_DELETE_DEFINITIONS=ON \
     ${ADDITIONAL_CMAKE_ARGS} \
     -DLLVM_LIT_ARGS="${LIT_FLAGS}" \
     -DLLVM_ENABLE_PROJECTS="libcxx;libcxxabi" \
-    -DCMAKE_OSX_ARCHITECTURES="i386;x86_64" # Build a universal dylib
+    -DCMAKE_OSX_ARCHITECTURES="i386;x86_64" \
+    "${MONOREPO_ROOT}/llvm"
 )
 echo "@@@@@@"