From 97f3b96659a36ce542d0116ba908bbf3eea0ee84 Mon Sep 17 00:00:00 2001 From: Marcel Pi Date: Fri, 22 Apr 2022 12:32:59 +0200 Subject: [PATCH] Minor Setup.sh changes. --- Util/BuildTools/Setup.sh | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/Util/BuildTools/Setup.sh b/Util/BuildTools/Setup.sh index 85e510e65..4947c267b 100755 --- a/Util/BuildTools/Setup.sh +++ b/Util/BuildTools/Setup.sh @@ -48,8 +48,6 @@ CXX_TAG=c$CARLA_CLANG_VERSION_MAJOR export CC=/usr/bin/clang-$CARLA_CLANG_VERSION_MAJOR export CXX=/usr/bin/clang++-$CARLA_CLANG_VERSION_MAJOR -source $(dirname "$0")/Environment.sh - # Convert comma-separated string to array of unique elements. IFS="," read -r -a PY_VERSION_LIST <<< "${PY_VERSION_LIST}" @@ -60,7 +58,7 @@ pushd ${CARLA_BUILD_FOLDER} >/dev/null # -- Get and compile libc++ ---------------------------------------------------- # ============================================================================== -LLVM_BASENAME=llvm-8.0 +LLVM_BASENAME=llvm-$CARLA_CLANG_VERSION_MAJOR.0 LLVM_INCLUDE=${PWD}/${LLVM_BASENAME}-install/include/c++/v1 LLVM_LIBPATH=${PWD}/${LLVM_BASENAME}-install/lib