diff options
| author | Louis Dionne <ldionne@apple.com> | 2019-09-11 16:57:19 +0000 |
|---|---|---|
| committer | Louis Dionne <ldionne@apple.com> | 2019-09-11 16:57:19 +0000 |
| commit | 340b72520292d649fdbb0d5bcf78575870f302fc (patch) | |
| tree | 07ac58d3757e1bd9a5ccc214e81e55f5a0b8854b | |
| parent | e39b5710c925633f6e1fd36ef7276e5234b8e476 (diff) | |
| download | bcm5719-llvm-340b72520292d649fdbb0d5bcf78575870f302fc.tar.gz bcm5719-llvm-340b72520292d649fdbb0d5bcf78575870f302fc.zip | |
[libc++] Add a CMake cache for Apple-specific configuration options
llvm-svn: 371638
| -rw-r--r-- | libcxx/cmake/caches/Apple.cmake | 15 | ||||
| -rwxr-xr-x | libcxx/utils/ci/macos-backdeployment.sh | 7 | ||||
| -rwxr-xr-x | libcxx/utils/ci/macos-trunk.sh | 9 |
3 files changed, 25 insertions, 6 deletions
diff --git a/libcxx/cmake/caches/Apple.cmake b/libcxx/cmake/caches/Apple.cmake new file mode 100644 index 00000000000..af4ea2c4c09 --- /dev/null +++ b/libcxx/cmake/caches/Apple.cmake @@ -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 "") diff --git a/libcxx/utils/ci/macos-backdeployment.sh b/libcxx/utils/ci/macos-backdeployment.sh index 0580509409e..6996af93434 100755 --- a/libcxx/utils/ci/macos-backdeployment.sh +++ b/libcxx/utils/ci/macos-backdeployment.sh @@ -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 "@@@@@@" diff --git a/libcxx/utils/ci/macos-trunk.sh b/libcxx/utils/ci/macos-trunk.sh index 5f8d499b56b..7a5ee75e2b5 100755 --- a/libcxx/utils/ci/macos-trunk.sh +++ b/libcxx/utils/ci/macos-trunk.sh @@ -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 "@@@@@@" |
