[libcxx-commits] [libcxx] 39a116e - [libc++] Move away from the standalone build for Apple libc++ and libc++abi

[Louis Dionne via libcxx-commits]

Author: Louis Dionne
Date: 2020-06-04T10:19:38-04:00
New Revision: 39a116ee07693a0f569ddba77dff540ce542f69e

URL: https://github.com/llvm/llvm-project/commit/39a116ee07693a0f569ddba77dff540ce542f69e
DIFF: https://github.com/llvm/llvm-project/commit/39a116ee07693a0f569ddba77dff540ce542f69e.diff

LOG: [libc++] Move away from the standalone build for Apple libc++ and libc++abi

Added: 
    

Modified: 
    libcxx/utils/ci/apple-install-libcxx.sh
    libcxx/utils/ci/apple-install-libcxxabi.sh

Removed: 
    


################################################################################
diff  --git a/libcxx/utils/ci/apple-install-libcxx.sh b/libcxx/utils/ci/apple-install-libcxx.sh
index b10f0a1578ba..8af854a8aa06 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 d550016a4c61..ac3255d0deea 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}" \