From 5befbff174406e5bae99c8d91245c628fed0585a Mon Sep 17 00:00:00 2001 From: Jordan Justen Date: Sun, 30 Oct 2022 15:16:19 -0700 Subject: [PATCH] d/rules: Check for previous version of llvm-spirv as well Signed-off-by: Jordan Justen --- debian/changelog | 1 + debian/rules | 4 ++++ 2 files changed, 5 insertions(+) diff --git a/debian/changelog b/debian/changelog index ae0f0704..73d6f099 100644 --- a/debian/changelog +++ b/debian/changelog @@ -7,6 +7,7 @@ llvm-toolchain-15 (1:15.0.3-3) UNRELEASED; urgency=medium * d/rules: Set LLVM_SPIRV with cmake for libclc * d/patches: Drop libclc-llvm-spirv.diff now that we are setting LLVM_SPIRV * d/rules: Restore building libclc .bc output without spir-v support + * d/rules: Check for previous version of llvm-spirv as well -- Jordan Justen Sun, 30 Oct 2022 00:26:40 -0700 diff --git a/debian/rules b/debian/rules index f1179237..4d8a59c8 100755 --- a/debian/rules +++ b/debian/rules @@ -245,6 +245,10 @@ endif LLVM_SPIRV_VERSION := $(LLVM_VERSION) LLVM_SPIRV := $(shell bash -c "command -v llvm-spirv-$(LLVM_SPIRV_VERSION)" 2>/dev/null) +ifndef LLVM_SPIRV + LLVM_SPIRV_VERSION := $(shell expr $(LLVM_VERSION) - 1) + LLVM_SPIRV := $(shell bash -c "command -v llvm-spirv-$(LLVM_SPIRV_VERSION)" 2>/dev/null) +endif ifndef LLVM_SPIRV LLVM_SPIRV_INSTALLED = no