diff --git a/debian/changelog b/debian/changelog index ddcc7a9a..40770925 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +llvm-toolchain-14 (1:14.0.0~+rc1-2) UNRELEASED; urgency=medium + + * Also path LD_LIBRARY_PATH for install + when cmake binary backport like on bionic s390x (for apt.llvm.org) + + -- Sylvestre Ledru Mon, 14 Feb 2022 21:19:44 +0100 + llvm-toolchain-14 (1:14.0.0~+rc1-1) unstable; urgency=medium * First testing release of 14 diff --git a/debian/rules b/debian/rules index 729dbf66..9c3042d8 100755 --- a/debian/rules +++ b/debian/rules @@ -733,7 +733,7 @@ override_dh_auto_install: # Clean up temporary files to make sure the install works rm -rf $(find $(TARGET_BUILD) -wholename '*CMakeFiles*' -not -name CMakeLists.txt -a -name "*.dir" -type d) # install/fast enables a make install without recompiling temporary files - LD_LIBRARY_PATH=$(STAGE_2_LIB_DIR) DESTDIR=$(DEB_INST)/ ninja -C $(TARGET_BUILD) $(VERBOSE) stage2-install + LD_LIBRARY_PATH=$(STAGE_2_LIB_DIR):$$LD_LIBRARY_PATH DESTDIR=$(DEB_INST)/ ninja -C $(TARGET_BUILD) $(VERBOSE) stage2-install # Not used on Linux. rm -f $(DEB_INST)/usr/lib/llvm-$(LLVM_VERSION)/bin/argdumper