]> git.proxmox.com Git - llvm-toolchain.git/commitdiff
d/rules: Call bash to use 'command -v' to locate llvm-spirv executable
authorJordan Justen <jljusten@debian.org>
Wed, 26 Oct 2022 17:22:47 +0000 (10:22 -0700)
committerJordan Justen <jljusten@debian.org>
Sun, 30 Oct 2022 07:29:06 +0000 (00:29 -0700)
I needed this for sbuild to find the executable.

Signed-off-by: Jordan Justen <jljusten@debian.org>
debian/changelog
debian/rules

index 4936ca498ffdee93078537eb0d42865d5e77d73a..47c37eb363a24a52a936f654b9b11041c8c52339 100644 (file)
@@ -2,6 +2,7 @@ llvm-toolchain-15 (1:15.0.3-3) UNRELEASED; urgency=medium
 
   [ Jordan Justen ]
   * d/rules: Rename LLVM_SPIR_VERSION to LLVM_SPIRV_VERSION
+  * d/rules: Call bash to use 'command -v' to locate llvm-spirv executable
 
  -- Jordan Justen <jljusten@debian.org>  Sun, 30 Oct 2022 00:26:40 -0700
 
index b769d352c3ebc5bd0fa8bf83584570bff7e9b5d0..eb62626295613016a54ce8b94daad7b006e05d69 100755 (executable)
@@ -244,8 +244,10 @@ else
 endif
 
 LLVM_SPIRV_VERSION=14
-ifeq ($(shell command -v llvm-spirv-$(LLVM_SPIRV_VERSION)),)
-LLVM_SPIRV_INSTALLED = no
+LLVM_SPIRV := $(shell bash -c "command -v llvm-spirv-$(LLVM_SPIRV_VERSION)" 2>/dev/null)
+
+ifndef LLVM_SPIRV
+       LLVM_SPIRV_INSTALLED = no
 else
        ifeq ($(shell dpkg --compare-versions $(shell dpkg-query -W -f '$${Version}' llvm-spirv-$(LLVM_SPIRV_VERSION)) gt 14.0.0 ; echo $$?),0)
 # Too old llvm-spirv version are failing. See #52200