maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

[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
This commit is contained in:
David Spickett 2021-07-09 15:29:40 -04:00 committed by Louis Dionne
parent 5511bfdb67
commit f8bef47348
1 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
libcxx/utils/ci/run-buildbot
View File

@ -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