[libcxx-commits] [libcxx] r356562 - [libc++] Do not force going through xcrun to find Clang in the macOS CI scripts

[Louis Dionne via libcxx-commits]

Author: ldionne
Date: Wed Mar 20 08:40:56 2019
New Revision: 356562

URL: http://llvm.org/viewvc/llvm-project?rev=356562&view=rev
Log:
[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.

Modified:
    libcxx/trunk/utils/ci/macos-backdeployment.sh
    libcxx/trunk/utils/ci/macos-trunk.sh

Modified: libcxx/trunk/utils/ci/macos-backdeployment.sh
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/utils/ci/macos-backdeployment.sh?rev=356562&r1=356561&r2=356562&view=diff
==============================================================================
--- libcxx/trunk/utils/ci/macos-backdeployment.sh (original)
+++ libcxx/trunk/utils/ci/macos-backdeployment.sh Wed Mar 20 08:40:56 2019
@@ -106,8 +106,6 @@ LIBCXXABI_INSTALL_DIR="${TEMP_DIR}/libcx
 
 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) @@@"

Modified: libcxx/trunk/utils/ci/macos-trunk.sh
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/utils/ci/macos-trunk.sh?rev=356562&r1=356561&r2=356562&view=diff
==============================================================================
--- libcxx/trunk/utils/ci/macos-trunk.sh (original)
+++ libcxx/trunk/utils/ci/macos-trunk.sh Wed Mar 20 08:40:56 2019
@@ -98,13 +98,10 @@ LIBCXX_INSTALL_DIR="${TEMP_DIR}/libcxx-i
 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 "@@@@@@"