Merge remote-tracking branch 'origin/6.0' into 7

This commit is contained in:
Sylvestre Ledru 2018-09-19 14:04:09 +02:00
commit 8ffe972043

2
debian/rules vendored
View File

@ -640,7 +640,7 @@ ifeq (${POLLY_ENABLE},yes)
ifneq (,$(filter libclang-common-$(LLVM_VERSION)-dev, $(shell dh_listpackages)))
dh_install -p libclang-common-$(LLVM_VERSION)-dev usr/lib/llvm-$(LLVM_VERSION)/lib/cmake/polly/*.cmake usr/lib/llvm-$(LLVM_VERSION)/lib/cmake/polly
# On old Debian & Ubuntu, removing the files is necessary
rm -rf debian/tmp/usr/lib/llvm-$(VERSION)/lib/cmake/polly/*.cmake
rm -rf debian/tmp/usr/lib/llvm-$(LLVM_VERSION)/lib/cmake/polly/*.cmake
else
rm -rf $(CURDIR)/debian/tmp/usr/lib/llvm-$(LLVM_VERSION)/lib/cmake/polly/*.cmake
endif