[libc++abi][ci] Add a from-scratch config for libc++abi on Apple/system
I came across an issue where since we build the library for Apple with
the install name directory being /usr/lib, which means that if we don't
run the tests with DYLD_LIBRARY_PATH, we'll end up loading the
system-provided libc++abi when running the tests. That wreaks havoc.
Instead of fixing it in the legacy config file, this commit introduces
an Apple libc++abi config file that does the right thing.
Differential Revision: https://reviews.llvm.org/D111279
GitOrigin-RevId: d1e0f02e0ba98cd371749c8d70ee9d153c559e91
diff --git a/utils/ci/apple-install-libcxx.sh b/utils/ci/apple-install-libcxx.sh
index aa54577..54d08b3 100755
--- a/utils/ci/apple-install-libcxx.sh
+++ b/utils/ci/apple-install-libcxx.sh
@@ -122,7 +122,8 @@
-DCMAKE_OSX_ARCHITECTURES="${arch}" \
-DLIBCXXABI_LIBRARY_VERSION="${version}" \
-DLIBCXX_INCLUDE_BENCHMARKS=OFF \
- -DLIBCXX_TEST_CONFIG="apple-libc++-shared.cfg.in"
+ -DLIBCXX_TEST_CONFIG="apple-libc++-shared.cfg.in" \
+ -DLIBCXXABI_TEST_CONFIG="apple-libc++abi-shared.cfg.in"
)
xcrun --sdk "${sdk}" cmake --build "${build_dir}/${arch}" --target install-cxx install-cxxabi -- -v
diff --git a/utils/ci/run-buildbot b/utils/ci/run-buildbot
index 1a90a52..0976145 100755
--- a/utils/ci/run-buildbot
+++ b/utils/ci/run-buildbot
@@ -373,7 +373,8 @@
x86_64-apple-system)
clean
generate-cmake -C "${MONOREPO_ROOT}/libcxx/cmake/caches/Apple.cmake" \
- -DLIBCXX_TEST_CONFIG="apple-libc++-shared.cfg.in"
+ -DLIBCXX_TEST_CONFIG="apple-libc++-shared.cfg.in" \
+ -DLIBCXXABI_TEST_CONFIG="apple-libc++abi-shared.cfg.in"
check-runtimes
;;
x86_64-apple-system-backdeployment-*)
