From f8bef4734845226c079900de3c273c8ab1915b49 Mon Sep 17 00:00:00 2001 From: David Spickett Date: Fri, 9 Jul 2021 15:29:40 -0400 Subject: [PATCH] [libcxx][CI] Work around Arm buildkite failures 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. Reviewed By: #libc, ldionne Differential Revision: https://reviews.llvm.org/D105704 --- libcxx/utils/ci/run-buildbot | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/libcxx/utils/ci/run-buildbot b/libcxx/utils/ci/run-buildbot index c401f2253ec6..15488e942527 100755 --- a/libcxx/utils/ci/run-buildbot +++ b/libcxx/utils/ci/run-buildbot @@ -469,11 +469,15 @@ legacy-standalone) ${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 \ @@ -482,22 +486,30 @@ aarch64-noexceptions) ;; # 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 -- 2.34.1