diff --git a/debian/changelog b/debian/changelog index d39bde95..eeaf7590 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,7 @@ llvm-toolchain-snapshot (1:14~++20210926041028+6063e6b499c7-1~exp2) experimental; urgency=medium * The triple change has been reverted. Keep it in Debian bring-back-triple-linux.diff + * Fix the "all" build -- diff --git a/debian/rules b/debian/rules index 80d13e9b..6b0b068e 100755 --- a/debian/rules +++ b/debian/rules @@ -831,13 +831,15 @@ override_dh_installdeb: # Symlink the weird llvm triple to Debian's # I know it is ugly but I cannot use debian dh_links as I don't know what # will be the llvm triple on other archs - - T=$(shell grep LLVM_HOST_TRIPLE $(CURDIR)/debian/llvm-$(LLVM_VERSION)-dev/usr/lib/llvm-$(LLVM_VERSION)/lib/cmake/llvm/LLVMConfig.cmake|cut -d\" -f2); \ - echo "triple = $$T"; \ - cd $(CURDIR)/debian/libc++abi1-$(LLVM_VERSION)/usr/lib/llvm-$(LLVM_VERSION)/lib/; \ - ln -s $$T $(DEB_HOST_MULTIARCH); \ - cd - && cd $(CURDIR)/debian/libunwind-$(LLVM_VERSION)/usr/lib/llvm-$(LLVM_VERSION)/lib/; \ - ln -s $$T $(DEB_HOST_MULTIARCH) +# Don't run when "all" is built + if test -f $(CURDIR)/debian/llvm-$(LLVM_VERSION)-dev/usr/lib/llvm-$(LLVM_VERSION)/lib/cmake/llvm/LLVMConfig.cmake then \ + T=$(shell grep LLVM_HOST_TRIPLE $(CURDIR)/debian/llvm-$(LLVM_VERSION)-dev/usr/lib/llvm-$(LLVM_VERSION)/lib/cmake/llvm/LLVMConfig.cmake|cut -d\" -f2); \ + echo "triple = $$T"; \ + cd $(CURDIR)/debian/libc++abi1-$(LLVM_VERSION)/usr/lib/llvm-$(LLVM_VERSION)/lib/; \ + ln -s $$T $(DEB_HOST_MULTIARCH); \ + cd - && cd $(CURDIR)/debian/libunwind-$(LLVM_VERSION)/usr/lib/llvm-$(LLVM_VERSION)/lib/; \ + ln -s $$T $(DEB_HOST_MULTIARCH); \ + fi ifeq (${RUN_TEST},yes)