From aaf40aa2501c27b45334700ecb25e8870ed40a6b Mon Sep 17 00:00:00 2001 From: Marcel Pi Date: Tue, 26 Apr 2022 16:13:17 +0200 Subject: [PATCH] Switched back to using LLVM-8.0. --- Util/BuildTools/Setup.sh | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/Util/BuildTools/Setup.sh b/Util/BuildTools/Setup.sh index 48ed7b54f..8a8312999 100755 --- a/Util/BuildTools/Setup.sh +++ b/Util/BuildTools/Setup.sh @@ -66,7 +66,7 @@ pushd ${CARLA_BUILD_FOLDER} >/dev/null # -- Get and compile libc++ ---------------------------------------------------- # ============================================================================== -LLVM_BASENAME=llvm-$CARLA_LLVM_VERSION_MAJOR.0 +LLVM_BASENAME=llvm-8.0 LLVM_INCLUDE=${PWD}/${LLVM_BASENAME}-install/include/c++/v1 LLVM_LIBPATH=${PWD}/${LLVM_BASENAME}-install/lib @@ -78,9 +78,10 @@ else log "Retrieving libc++." - git clone --depth=1 -b release_${CARLA_LLVM_VERSION_MAJOR}0 https://github.com/llvm-mirror/llvm.git ${LLVM_BASENAME}-source - git clone --depth=1 -b release_${CARLA_LLVM_VERSION_MAJOR}0 https://github.com/llvm-mirror/libcxx.git ${LLVM_BASENAME}-source/projects/libcxx - git clone --depth=1 -b release_${CARLA_LLVM_VERSION_MAJOR}0 https://github.com/llvm-mirror/libcxxabi.git ${LLVM_BASENAME}-source/projects/libcxxabi + # TODO URGENT: These links are out of date! LLVM has moved to https://github.com/llvm/llvm-project. + git clone --depth=1 -b release_80 https://github.com/llvm-mirror/llvm.git ${LLVM_BASENAME}-source + git clone --depth=1 -b release_80 https://github.com/llvm-mirror/libcxx.git ${LLVM_BASENAME}-source/projects/libcxx + git clone --depth=1 -b release_80 https://github.com/llvm-mirror/libcxxabi.git ${LLVM_BASENAME}-source/projects/libcxxabi log "Compiling libc++."