[libcxx-commits] [libcxx] 7fcbb64 - [runtimes] Workaround a subtle linker issue on macOS in the CI

[Louis Dionne via libcxx-commits]

Author: Louis Dionne
Date: 2023-09-21T11:29:45-04:00
New Revision: 7fcbb64fca5e664b11f9167a215b47de2ae9082c

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

LOG: [runtimes] Workaround a subtle linker issue on macOS in the CI

Added: 
    

Modified: 
    libcxx/utils/ci/run-buildbot

Removed: 
    


################################################################################
diff  --git a/libcxx/utils/ci/run-buildbot b/libcxx/utils/ci/run-buildbot
index 84f9b4a747aa41b..a88716bc992201b 100755
--- a/libcxx/utils/ci/run-buildbot
+++ b/libcxx/utils/ci/run-buildbot
@@ -162,9 +162,6 @@ function generate-cmake-libcxx-win() {
 }
 
 function check-runtimes() {
-    echo "--- Installing libc++, libc++abi and libunwind to a fake location"
-    ${NINJA} -vC "${BUILD_DIR}" install-cxx install-cxxabi install-unwind
-
     echo "+++ Running the libc++ tests"
     ${NINJA} -vC "${BUILD_DIR}" check-cxx
 
@@ -173,6 +170,19 @@ function check-runtimes() {
 
     echo "+++ Running the libunwind tests"
     ${NINJA} -vC "${BUILD_DIR}" check-unwind
+
+    # TODO: On macOS 13.5, the linker seems to have an issue where it will pick up
+    #       a library if it exists inside a -L search path, even if we don't link
+    #       against that library. This happens with libunwind.dylib if it is built
+    #       at the point when we run the libc++ tests, which causes issues cause we
+    #       are also linking against the system unwinder.
+    #
+    #       I believe this is a linker regression and I reported it as rdar://115842730.
+    #       It should be possible to move this installation step back to the top once
+    #       that issue has been resolved, but in the meantime it doesn't really hurt to
+    #       have it here.
+    echo "--- Installing libc++, libc++abi and libunwind to a fake location"
+    ${NINJA} -vC "${BUILD_DIR}" install-cxx install-cxxabi install-unwind
 }
 
 # TODO: The goal is to test this against all configurations. We should also move