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

This commit is contained in:
Sylvestre Ledru 2021-09-18 21:09:16 +02:00
commit ab717f0bf9

2
debian/rules vendored
View File

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