From 26b13da1c032ff3426012f43b17a8fa86598857b Mon Sep 17 00:00:00 2001
From: Martin Nowack <m.nowack@imperial.ac.uk>
Date: Tue, 1 Dec 2020 11:29:15 +0000
Subject: Handle LLVM version selection more robust

---
 scripts/build/v-llvm.inc | 19 ++++++++++++++++++-
 1 file changed, 18 insertions(+), 1 deletion(-)

(limited to 'scripts/build/v-llvm.inc')

diff --git a/scripts/build/v-llvm.inc b/scripts/build/v-llvm.inc
index 5ec6f713..9d84f6c2 100644
--- a/scripts/build/v-llvm.inc
+++ b/scripts/build/v-llvm.inc
@@ -22,7 +22,24 @@ export_variables_llvm=(
 artifact_dependency_llvm=("sanitizer")
 
 setup_variables_llvm() {
-  LLVM_VERSION_SHORT="${LLVM_VERSION/./}"
+  local v_a
+  v_a=(${LLVM_VERSION//./ })
+
+  LLVM_VERSION_MAJOR="0"
+  LLVM_VERSION_MINOR="0"
+  LLVM_VERSION_PATCH="0"
+
+  if [[ "${#v_a[@]}" -ge 1 ]]; then
+    LLVM_VERSION_MAJOR="${v_a[0]}"
+  fi
+  if [[ "${#v_a[@]}" -ge 2 ]]; then
+    LLVM_VERSION_MINOR="${v_a[1]}"
+  fi
+  if [[ "${#v_a[@]}" -ge 3 ]]; then
+    LLVM_VERSION_PATCH="${v_a[2]}"
+  fi
+
+  LLVM_VERSION_SHORT="${LLVM_VERSION_MAJOR}${LLVM_VERSION_MINOR}"
 }
 
 check_export_variables_llvm() {
-- 
cgit 1.4.1