Merge remote-tracking branch 'origin/12' into 13

This commit is contained in:
Sylvestre Ledru 2021-09-18 21:37:21 +02:00
commit 9e1fc686b7

2
debian/rules vendored
View File

@ -137,7 +137,7 @@ else
control_vars = '-Vdep:devlibs=libstdc++6-$(GCC_VERSION)-dev'
endif
ifeq ($(shell bash -c "type -p llvm-spirv"))
ifeq ($(shell which llvm-spirv),)
LLVM_SPIRV_INSTALLED = no
else
LLVM_SPIRV_INSTALLED = yes