From ebdaaf1407035d02dcf9eb2b7a93abc4387ba4ae Mon Sep 17 00:00:00 2001
From: Martin Nowack <m.nowack@imperial.ac.uk>
Date: Fri, 25 Mar 2022 23:08:27 +0000
Subject: Minor clean-up

---
 scripts/build/p-clang-linux.inc | 2 +-
 scripts/build/p-libcxx.inc      | 4 ----
 2 files changed, 1 insertion(+), 5 deletions(-)

(limited to 'scripts')

diff --git a/scripts/build/p-clang-linux.inc b/scripts/build/p-clang-linux.inc
index c6ee025e..25f468fa 100644
--- a/scripts/build/p-clang-linux.inc
+++ b/scripts/build/p-clang-linux.inc
@@ -6,7 +6,7 @@ setup_artifact_variables_clang() {
   [[ "${LLVM_VERSION_MAJOR}" -ge 7 ]] && version="-${LLVM_VERSION_MAJOR}"
 
   # Only set LLVM_CONFIG if not set yet
-  if [[ -z "${LLVM_CONFIG-}" ]]; then
+  if [[ -z "${LLVM_CONFIG:-}" ]]; then
     LLVM_CONFIG=$(which "llvm-config${version}")
   fi
 
diff --git a/scripts/build/p-libcxx.inc b/scripts/build/p-libcxx.inc
index d88699ba..27fe4a61 100644
--- a/scripts/build/p-libcxx.inc
+++ b/scripts/build/p-libcxx.inc
@@ -20,10 +20,6 @@ download_libcxx() {
      patch -p1 --follow-symlinks -i "${DIR}/patches/libcxx${LLVM_VERSION_SHORT}.patch" || return 1
   fi
 
-  # Prepare LLVM subprojects for older LLVM versions
-  cd "${LIBCXX_SRC}/llvm/projects"
-  ln -s ../../libcxx .
-  ln -s ../../libcxxabi .
 
   touch "${LIBCXX_SRC}/.src_checked_out" 
 }
-- 
cgit 1.4.1