replica
/
hanchenye-llvm-project
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

[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
This commit is contained in:
Louis Dionne 2019-03-20 15:40:56 +00:00
parent 137976fae2
commit e526a6bd55
2 changed files with 1 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libcxx/utils/ci/macos-backdeployment.sh
View File

@ -106,8 +106,6 @@ LIBCXXABI_INSTALL_DIR="${TEMP_DIR}/libcxxabi-install"
PREVIOUS_DYLIBS_URL="http://lab.llvm.org:8080/roots/libcxx-roots.tar.gz" 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" 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) @@@" echo "@@@ Downloading LLVM tarball of master (only used for CMake configuration) @@@"

5
libcxx/utils/ci/macos-trunk.sh
View File

@ -98,13 +98,10 @@ LIBCXX_INSTALL_DIR="${TEMP_DIR}/libcxx-install"
LIBCXXABI_BUILD_DIR="${TEMP_DIR}/libcxxabi-build" LIBCXXABI_BUILD_DIR="${TEMP_DIR}/libcxxabi-build"
LIBCXXABI_INSTALL_DIR="${TEMP_DIR}/libcxxabi-install" 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) @@@" echo "@@@ Downloading LLVM tarball of master (only used for CMake configuration) @@@"
mkdir "${LLVM_ROOT}" 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}" curl -L "${LLVM_TARBALL_URL}" | tar -xz --strip-components=1 -C "${LLVM_ROOT}"
echo "@@@@@@" echo "@@@@@@"