diff --git a/debian/changelog b/debian/changelog index 11a9f1f7..4936ca49 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,7 @@ llvm-toolchain-15 (1:15.0.3-3) UNRELEASED; urgency=medium - * UNRELEASED + [ Jordan Justen ] + * d/rules: Rename LLVM_SPIR_VERSION to LLVM_SPIRV_VERSION -- Jordan Justen Sun, 30 Oct 2022 00:26:40 -0700 diff --git a/debian/rules b/debian/rules index 1a82e96e..b769d352 100755 --- a/debian/rules +++ b/debian/rules @@ -243,11 +243,11 @@ else control_vars = '-Vdep:devlibs=libstdc++6-$(GCC_VERSION)-dev' endif -LLVM_SPIR_VERSION=14 -ifeq ($(shell command -v llvm-spirv-$(LLVM_SPIR_VERSION)),) +LLVM_SPIRV_VERSION=14 +ifeq ($(shell command -v llvm-spirv-$(LLVM_SPIRV_VERSION)),) LLVM_SPIRV_INSTALLED = no else - ifeq ($(shell dpkg --compare-versions $(shell dpkg-query -W -f '$${Version}' llvm-spirv-$(LLVM_SPIR_VERSION)) gt 14.0.0 ; echo $$?),0) + 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 LLVM_SPIRV_INSTALLED = yes else @@ -733,7 +733,7 @@ ifeq ($(LLVM_SPIRV_INSTALLED),yes) -DCMAKE_INSTALL_DATADIR=lib \ -DCMAKE_INSTALL_INCLUDEDIR=include \ -DLLVM_CONFIG=$(STAGE_2_BIN_DIR)/llvm-config \ - -DLLVM_SPIRV=/usr/bin/llvm-spirv-$(LLVM_SPIR_VERSION) \ + -DLLVM_SPIRV=/usr/bin/llvm-spirv-$(LLVM_SPIRV_VERSION) \ -DLIBCLC_TARGETS_TO_BUILD=$(LIBCLC_TARGETS_TO_BUILD); \ ninja -j $(NJOBS) $(VERBOSE) else