diff --git a/debian/changelog b/debian/changelog index 9126ac5d..dca5e80a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -4,6 +4,7 @@ llvm-toolchain-15 (1:15.0.3-3) UNRELEASED; urgency=medium * d/rules: Rename LLVM_SPIR_VERSION to LLVM_SPIRV_VERSION * d/rules: Call bash to use 'command -v' to locate llvm-spirv executable * debian: Bump llvm-spirv to 15 to match the llvm version + * d/rules: Set LLVM_SPIRV with cmake for libclc -- Jordan Justen Sun, 30 Oct 2022 00:26:40 -0700 diff --git a/debian/rules b/debian/rules index c8b483d2..e4a0d176 100755 --- a/debian/rules +++ b/debian/rules @@ -258,8 +258,10 @@ else endif LIBCLC_TARGETS_TO_BUILD="amdgcn--;amdgcn--amdhsa;amdgcn-mesa-mesa3d;r600--;nvptx--;nvptx64--;nvptx--nvidiacl;nvptx64--nvidiacl" +LIBCLC_LLVM_SPIRV = ifeq ($(LLVM_SPIRV_INSTALLED),yes) LIBCLC_TARGETS_TO_BUILD := $(LIBCLC_TARGETS_TO_BUILD)";spirv-mesa3d-;spirv64-mesa3d-" + LIBCLC_LLVM_SPIRV = "-DLLVM_SPIRV=$(LLVM_SPIRV)" endif BINUTILS_GOLD_ARCHS := amd64 arm64 armhf i386 ppc64 ppc64el x32 s390x hurd-i386 kfreebsd-amd64 kfreebsd-i386 @@ -735,7 +737,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_SPIRV_VERSION) \ + $(LIBCLC_LLVM_SPIRV) \ -DLIBCLC_TARGETS_TO_BUILD=$(LIBCLC_TARGETS_TO_BUILD); \ ninja -j $(NJOBS) $(VERBOSE) else