Merge branch 'libclc-13-spv-no-empty-param' into '13'

Fix empty "" parameter for libclc cmake if llvm-spirv is not found

See merge request pkg-llvm-team/llvm-toolchain!99
This commit is contained in:
Sylvestre Ledru 2022-10-29 06:53:29 +00:00
commit 1bc018374e
2 changed files with 8 additions and 2 deletions

6
debian/changelog vendored
View File

@ -1,3 +1,9 @@
llvm-toolchain-13 (1:13.0.1-9) UNRELEASED; urgency=medium
* d/rules: Don't send an empty string to cmake when llvm-spirv is not found
-- Jordan Justen <jljusten@debian.org> Fri, 28 Oct 2022 10:17:57 -0700
llvm-toolchain-13 (1:13.0.1-8) unstable; urgency=medium
[ Sylvestre Ledru ]

4
debian/rules vendored
View File

@ -234,10 +234,10 @@ else
endif
LIBCLC_TARGETS_TO_BUILD="amdgcn--;amdgcn--amdhsa;amdgcn-mesa-mesa3d;r600--;nvptx--;nvptx64--;nvptx--nvidiacl;nvptx64--nvidiacl"
LIBCLC_TARGETS_LLVM_SPIRV := ""
LIBCLC_TARGETS_LLVM_SPIRV =
ifeq ($(LLVM_SPIRV_INSTALLED),yes)
LIBCLC_TARGETS_TO_BUILD := $(LIBCLC_TARGETS_TO_BUILD)";spirv-mesa3d-;spirv64-mesa3d-"
LIBCLC_TARGETS_LLVM_SPIRV := "-DLLVM_SPIRV=$(LLVM_SPIRV)"
LIBCLC_TARGETS_LLVM_SPIRV = "-DLLVM_SPIRV=$(LLVM_SPIRV)"
endif
BINUTILS_GOLD_ARCHS := amd64 arm64 armhf i386 ppc64 ppc64el x32 s390x hurd-i386 kfreebsd-amd64 kfreebsd-i386