From e526a6bd5598c26e29c308bfe4562c6de0af7f5c Mon Sep 17 00:00:00 2001 From: Louis Dionne Date: Wed, 20 Mar 2019 15:40:56 +0000 Subject: [PATCH] [libc++] Do not force going through xcrun to find Clang in the macOS CI scripts It should be possible to run those CI scripts with different compilers by simply exporting a different CXX environment variable. llvm-svn: 356562 --- libcxx/utils/ci/macos-backdeployment.sh | 2 -- libcxx/utils/ci/macos-trunk.sh | 5 +---- 2 files changed, 1 insertion(+), 6 deletions(-) diff --git a/libcxx/utils/ci/macos-backdeployment.sh b/libcxx/utils/ci/macos-backdeployment.sh index aaed799a3047..bf4984d1fa0f 100755 --- a/libcxx/utils/ci/macos-backdeployment.sh +++ b/libcxx/utils/ci/macos-backdeployment.sh @@ -106,8 +106,6 @@ LIBCXXABI_INSTALL_DIR="${TEMP_DIR}/libcxxabi-install" PREVIOUS_DYLIBS_URL="http://lab.llvm.org:8080/roots/libcxx-roots.tar.gz" LLVM_TARBALL_URL="https://github.com/llvm-mirror/llvm/archive/master.tar.gz" -export CC="$(xcrun --find clang)" -export CXX="$(xcrun --find clang++)" echo "@@@ Downloading LLVM tarball of master (only used for CMake configuration) @@@" diff --git a/libcxx/utils/ci/macos-trunk.sh b/libcxx/utils/ci/macos-trunk.sh index b64633387b20..de7db0d3809d 100755 --- a/libcxx/utils/ci/macos-trunk.sh +++ b/libcxx/utils/ci/macos-trunk.sh @@ -98,13 +98,10 @@ LIBCXX_INSTALL_DIR="${TEMP_DIR}/libcxx-install" LIBCXXABI_BUILD_DIR="${TEMP_DIR}/libcxxabi-build" LIBCXXABI_INSTALL_DIR="${TEMP_DIR}/libcxxabi-install" -LLVM_TARBALL_URL="https://github.com/llvm-mirror/llvm/archive/master.tar.gz" -export CC="$(xcrun --find clang)" -export CXX="$(xcrun --find clang++)" - echo "@@@ Downloading LLVM tarball of master (only used for CMake configuration) @@@" mkdir "${LLVM_ROOT}" +LLVM_TARBALL_URL="https://github.com/llvm-mirror/llvm/archive/master.tar.gz" curl -L "${LLVM_TARBALL_URL}" | tar -xz --strip-components=1 -C "${LLVM_ROOT}" echo "@@@@@@"