remove the triple as it isn't the right approach for now (this can be revert)

This commit is contained in:
Sylvestre Ledru 2021-10-14 23:38:20 +02:00
parent 388ce8964c
commit fd14caa215

17
debian/rules vendored
View File

@ -771,9 +771,7 @@ override_dh_makeshlibs:
override_dh_shlibdeps: override_dh_shlibdeps:
# Ignore asan libraries. They would trigger dependencies to multiarch libraries # Ignore asan libraries. They would trigger dependencies to multiarch libraries
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); \ dh_shlibdeps -l$(DEB_INST)/usr/lib/llvm-$(LLVM_VERSION)/lib/ -Xlibclang_rt.asan -Xlibclang_rt.asan -Xlibclang_rt.asan-*.so -Xlibclang_rt.asan-*.so
echo "target = $$T"; \
dh_shlibdeps -l$(DEB_INST)/usr/lib/llvm-$(LLVM_VERSION)/lib/:$(DEB_INST)/usr/lib/llvm-$(LLVM_VERSION)/lib/$$T/ -Xlibclang_rt.asan -Xlibclang_rt.asan -Xlibclang_rt.asan-*.so -Xlibclang_rt.asan-*.so
override_dh_installman: override_dh_installman:
if test -f lld/docs/ld.lld.1; then \ if test -f lld/docs/ld.lld.1; then \
@ -848,19 +846,6 @@ override_dh_installdeb:
# Remove auto generated python pyc # Remove auto generated python pyc
find $(CURDIR)/debian/llvm-$(LLVM_VERSION)-tools/usr/lib/llvm-$(LLVM_VERSION)/ -name '*.pyc' | xargs -r rm -f find $(CURDIR)/debian/llvm-$(LLVM_VERSION)-tools/usr/lib/llvm-$(LLVM_VERSION)/ -name '*.pyc' | xargs -r rm -f
# 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
# 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) ifeq (${RUN_TEST},yes)
# List of the archs we know we have 100 % tests working # List of the archs we know we have 100 % tests working