From 39a116ee07693a0f569ddba77dff540ce542f69e Mon Sep 17 00:00:00 2001 From: Louis Dionne Date: Thu, 4 Jun 2020 10:18:50 -0400 Subject: [PATCH] [libc++] Move away from the standalone build for Apple libc++ and libc++abi --- libcxx/utils/ci/apple-install-libcxx.sh | 3 ++- libcxx/utils/ci/apple-install-libcxxabi.sh | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/libcxx/utils/ci/apple-install-libcxx.sh b/libcxx/utils/ci/apple-install-libcxx.sh index b10f0a1..8af854a 100755 --- a/libcxx/utils/ci/apple-install-libcxx.sh +++ b/libcxx/utils/ci/apple-install-libcxx.sh @@ -113,9 +113,10 @@ for arch in ${architectures}; do step "Building libc++.dylib for architecture ${arch}" mkdir -p "${build_dir}/${arch}" (cd "${build_dir}/${arch}" && - xcrun --sdk "${sdk}" cmake "${llvm_root}/libcxx" \ + xcrun --sdk "${sdk}" cmake "${llvm_root}/llvm" \ -GNinja \ -DCMAKE_MAKE_PROGRAM="$(xcrun --sdk "${sdk}" --find ninja)" \ + -DLLVM_ENABLE_PROJECTS="libcxx;libcxxabi" \ -C "${cache}" \ -DCMAKE_INSTALL_PREFIX="${build_dir}/${arch}-install" \ -DCMAKE_INSTALL_NAME_DIR="${install_name_dir}" \ diff --git a/libcxx/utils/ci/apple-install-libcxxabi.sh b/libcxx/utils/ci/apple-install-libcxxabi.sh index d550016..ac3255d 100755 --- a/libcxx/utils/ci/apple-install-libcxxabi.sh +++ b/libcxx/utils/ci/apple-install-libcxxabi.sh @@ -112,9 +112,10 @@ for arch in ${architectures}; do step "Building libc++abi.dylib for architecture ${arch}" mkdir -p "${build_dir}/${arch}" (cd "${build_dir}/${arch}" && - xcrun --sdk "${sdk}" cmake "${llvm_root}/libcxxabi" \ + xcrun --sdk "${sdk}" cmake "${llvm_root}/llvm" \ -GNinja \ -DCMAKE_MAKE_PROGRAM="$(xcrun --sdk "${sdk}" --find ninja)" \ + -DLLVM_ENABLE_PROJECTS="libcxx;libcxxabi" \ -C "${cache}" \ -DCMAKE_INSTALL_PREFIX="${build_dir}/${arch}-install" \ -DCMAKE_INSTALL_NAME_DIR="${install_name_dir}" \ -- 2.7.4