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