[libcxx-commits] [PATCH] D105704: [libcxx][CI] Work around Arm buildkite failures

[David Spickett via Phabricator via libcxx-commits]

DavidSpickett created this revision.
Herald added subscribers: kristof.beyls, arichardson.
DavidSpickett requested review of this revision.
Herald added a project: libc++.
Herald added a subscriber: libcxx-commits.
Herald added a reviewer: libc++.

For reasons unknown, the build is now using compilers
from /usr/bin instead of /usr/local/bin which is where
we have our clang-12 aliases placed.


Repository:
  rG LLVM Github Monorepo

https://reviews.llvm.org/D105704

Files:
  libcxx/utils/ci/run-buildbot


Index: libcxx/utils/ci/run-buildbot
===================================================================
--- libcxx/utils/ci/run-buildbot
+++ libcxx/utils/ci/run-buildbot
@@ -466,11 +466,15 @@
     ${NINJA} -vC "${BUILD_DIR}/libcxxabi" check-cxxabi
 ;;
 aarch64)
+    export CC=/usr/local/bin/cc
+    export CXX=/usr/local/bin/c++
     clean
     generate-cmake -C "${MONOREPO_ROOT}/libcxx/cmake/caches/AArch64.cmake"
     check-cxx-cxxabi
 ;;
 aarch64-noexceptions)
+    export CC=/usr/local/bin/cc
+    export CXX=/usr/local/bin/c++
     clean
     generate-cmake -C "${MONOREPO_ROOT}/libcxx/cmake/caches/AArch64.cmake" \
     -DLIBCXX_ENABLE_EXCEPTIONS=OFF \
@@ -479,22 +483,30 @@
 ;;
 # Aka Armv8 32 bit
 armv8)
+    export CC=/usr/local/bin/cc
+    export CXX=/usr/local/bin/c++
     clean
     generate-cmake -C "${MONOREPO_ROOT}/libcxx/cmake/caches/Armv8Arm.cmake"
     check-cxx-cxxabi
 ;;
 armv8-noexceptions)
+    export CC=/usr/local/bin/cc
+    export CXX=/usr/local/bin/c++
     clean
     generate-cmake -C "${MONOREPO_ROOT}/libcxx/cmake/caches/Armv8Thumb-noexceptions.cmake"
     check-cxx-cxxabi
 ;;
 # Armv7 32 bit. One building Arm only one Thumb only code.
 armv7)
+    export CC=/usr/local/bin/cc
+    export CXX=/usr/local/bin/c++
     clean
     generate-cmake -C "${MONOREPO_ROOT}/libcxx/cmake/caches/Armv7Arm.cmake"
     check-cxx-cxxabi
 ;;
 armv7-noexceptions)
+    export CC=/usr/local/bin/cc
+    export CXX=/usr/local/bin/c++
     clean
     generate-cmake -C "${MONOREPO_ROOT}/libcxx/cmake/caches/Armv7Thumb-noexceptions.cmake"
     check-cxx-cxxabi


-------------- next part --------------
A non-text attachment was scrubbed...
Name: D105704.357513.patch
Type: text/x-patch
Size: 1579 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/libcxx-commits/attachments/20210709/4b386605/attachment.bin>