[libcxx-commits] [libcxx] a486edd - [libc++abi] Assume that libcxx is checked out in the Apple build script

[Louis Dionne via libcxx-commits]

Author: Louis Dionne
Date: 2020-04-27T11:20:11-04:00
New Revision: a486edd03ae35c31c8b355f28d948bf14a05937c

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

LOG: [libc++abi] Assume that libcxx is checked out in the Apple build script

Instead of using the libc++ headers provided alongside the toolchain,
use those in the sibling libcxx directory that we know is checked out.
Before the days of the monorepo, we couldn't assume that the libc++
repository was present when building libcxxabi. Since we can now make
that assumption, it's always better to use the version of libc++ that
is in lockstep with libc++abi, to avoid subtle bugs.

Added: 
    

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

Removed: 
    


################################################################################
diff  --git a/libcxx/utils/ci/apple-install-libcxxabi.sh b/libcxx/utils/ci/apple-install-libcxxabi.sh
index 04173b2adbeb..d550016a4c61 100755
--- a/libcxx/utils/ci/apple-install-libcxxabi.sh
+++ b/libcxx/utils/ci/apple-install-libcxxabi.sh
@@ -120,7 +120,7 @@ for arch in ${architectures}; do
             -DCMAKE_INSTALL_NAME_DIR="${install_name_dir}" \
             -DCMAKE_OSX_ARCHITECTURES="${arch}" \
             -DLIBCXXABI_LIBRARY_VERSION="${version}" \
-            -DLIBCXXABI_LIBCXX_INCLUDES="$(xcrun --sdk "${sdk}" c++ -print-resource-dir)/../../../include/c++/v1"
+            -DLIBCXXABI_LIBCXX_PATH="${llvm_root}/libcxx"
     )
 
     xcrun --sdk "${sdk}" cmake --build "${build_dir}/${arch}" --target install-cxxabi -- -v