From 0373fd7d10fb5b23c86ebec2e932ea8f059f5b71 Mon Sep 17 00:00:00 2001
From: Martin Nowack <m.nowack@imperial.ac.uk>
Date: Fri, 25 Mar 2022 23:07:40 +0000
Subject: Clearly separate between LLVM, a bitcode compiler, and sanitizer
 compiler

All three can be different but also provided by the same package.
By separating the different use-cases, it allows to set them
independently.
---
 scripts/build/v-sanitizer.inc | 23 ++++++++++++++---------
 1 file changed, 14 insertions(+), 9 deletions(-)

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

diff --git a/scripts/build/v-sanitizer.inc b/scripts/build/v-sanitizer.inc
index 895ffd21..b86ef23f 100644
--- a/scripts/build/v-sanitizer.inc
+++ b/scripts/build/v-sanitizer.inc
@@ -1,15 +1,20 @@
-#!/bin/bash
 # Variables for sanitizer handling
-
-required_variables_sanitizer=(
-  "SANITIZER_BUILD"
-)
+required_variables_sanitizer(){
+ if [[ -z ${SANITIZER_BUILD:-} ]]; then
+   return 0
+ fi
+ echo "SANITIZER_BUILD"
+ echo "SANITIZER_LLVM_VERSION"
+}
 
 artifact_dependency_sanitizer=("")
 
 required_variables_check_sanitizer() {
-  # Allowe empty sanitizer builds
-  [[ -z "${SANITIZER_BUILD}" ]] && return 0
+  # Allow empty sanitizer builds
+  if [[ -z ${SANITIZER_BUILD:-} ]]; then
+    SANITIZER_BUILD=""
+    return 0
+  fi
   
   local sanitizers
   IFS=":" read -r -a sanitizers <<< "${SANITIZER_BUILD}"
@@ -25,7 +30,7 @@ required_variables_check_sanitizer() {
 }
 
 setup_variables_sanitizer() {
-  if [[ -z "${SANITIZER_BUILD}" ]]; then
+  if [[ -z "${SANITIZER_BUILD:-}" ]]; then
     SANITIZERS=("")
     SANITIZER_SUFFIX=""
     return 0
@@ -89,4 +94,4 @@ setup_variables_sanitizer() {
     echo "Unknown sanitizer: $sanitizer"
     exit 1
   done
-  }
+}
-- 
cgit 1.4.1