From 6cc8ee707c1b4337120aa2972e2ad13a4861bbc3 Mon Sep 17 00:00:00 2001 From: Frank Busse Date: Mon, 13 Jun 2022 10:42:51 +0100 Subject: remove LLVM < 9 --- scripts/build/p-sanitizer-linux.inc | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) (limited to 'scripts/build/p-sanitizer-linux.inc') diff --git a/scripts/build/p-sanitizer-linux.inc b/scripts/build/p-sanitizer-linux.inc index b7a7718e..fa9f35f3 100644 --- a/scripts/build/p-sanitizer-linux.inc +++ b/scripts/build/p-sanitizer-linux.inc @@ -1,9 +1,7 @@ setup_artifact_variables_sanitizer() { local SANITIZER_LLVM_VERSION_MAJOR="${SANITIZER_LLVM_VERSION/.*/}" local SANITIZER_LLVM_VERSION_MINOR="${SANITIZER_LLVM_VERSION/*./}" - local version="" - [[ "${SANITIZER_LLVM_VERSION_MAJOR}" -le 6 ]] && version="-${SANITIZER_LLVM_VERSION}" - [[ "${SANITIZER_LLVM_VERSION_MAJOR}" -ge 7 ]] && version="-${SANITIZER_LLVM_VERSION_MAJOR}" + local version="-${SANITIZER_LLVM_VERSION_MAJOR}" # Only set LLVM_CONFIG if not set yet if [[ -z "${SANITIZER_LLVM_CONFIG-}" ]]; then @@ -33,9 +31,7 @@ is_installed_sanitizer() { fi local SANITIZER_LLVM_VERSION_MAJOR="${SANITIZER_LLVM_VERSION/.*/}" local SANITIZER_LLVM_VERSION_MINOR="${SANITIZER_LLVM_VERSION/*./}" - local version="" - [[ "${SANITIZER_LLVM_VERSION_MAJOR}" -le 6 ]] && version="${SANITIZER_LLVM_VERSION}" - [[ "${SANITIZER_LLVM_VERSION_MAJOR}" -ge 7 ]] && version="${SANITIZER_LLVM_VERSION_MAJOR}" + local version=="${SANITIZER_LLVM_VERSION_MAJOR}" # Check if clang with the right version exists which "clang-${version}" -- cgit 1.4.1