[libcxx-commits] [PATCH] D107172: Revert "[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++.

This reverts commit f8bef4734845226c079900de3c273c8ab1915b49 <https://reviews.llvm.org/rGf8bef4734845226c079900de3c273c8ab1915b49>.

Buildkite agent 3.32.0 includes a fix for the PATH issue.
https://github.com/buildkite/agent/releases/tag/v3.32.0


Repository:
  rG LLVM Github Monorepo

https://reviews.llvm.org/D107172

Files:
  libcxx/utils/ci/run-buildbot


Index: libcxx/utils/ci/run-buildbot
===================================================================
--- libcxx/utils/ci/run-buildbot
+++ libcxx/utils/ci/run-buildbot
@@ -480,15 +480,11 @@
     ${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 \
@@ -497,30 +493,22 @@
 ;;
 # 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: D107172.363107.patch
Type: text/x-patch
Size: 1594 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/libcxx-commits/attachments/20210730/22a26391/attachment.bin>