diff --git a/debian/changelog b/debian/changelog index ee1afc16..68ddc979 100644 --- a/debian/changelog +++ b/debian/changelog @@ -19,7 +19,6 @@ llvm-toolchain-snapshot (1:14~++20210926041028+6063e6b499c7-1~exp1) experimental * experimental New snapshot release * Bring back the libc++/libc++abi options - * Fix the libc++/libc++abi symlink issues after their moves in the triple directory -- Sylvestre Ledru Sun, 26 Sep 2021 16:14:44 +0200 diff --git a/debian/libc++1-X.Y.links.in b/debian/libc++1-X.Y.links.in index 4c155e99..4d1955c5 100644 --- a/debian/libc++1-X.Y.links.in +++ b/debian/libc++1-X.Y.links.in @@ -1,2 +1,2 @@ -usr/lib/llvm-@LLVM_VERSION@/lib/@DEB_HOST_MULTIARCH@/libc++.so.1.0 /usr/lib/@DEB_HOST_MULTIARCH@/libc++.so.1.0 +usr/lib/llvm-@LLVM_VERSION@/lib/libc++.so.1.0 /usr/lib/@DEB_HOST_MULTIARCH@/libc++.so.1.0 /usr/lib/@DEB_HOST_MULTIARCH@/libc++.so.1.0 /usr/lib/@DEB_HOST_MULTIARCH@/libc++.so.1 diff --git a/debian/libc++abi-X.Y-dev.links.in b/debian/libc++abi-X.Y-dev.links.in index 6d4cd4de..6dd5f555 100644 --- a/debian/libc++abi-X.Y-dev.links.in +++ b/debian/libc++abi-X.Y-dev.links.in @@ -1 +1 @@ -usr/lib/llvm-@LLVM_VERSION@/lib/@DEB_HOST_MULTIARCH@/libc++abi.so /usr/lib/@DEB_HOST_MULTIARCH@/libc++abi.so +usr/lib/llvm-@LLVM_VERSION@/lib/libc++abi.so /usr/lib/@DEB_HOST_MULTIARCH@/libc++abi.so diff --git a/debian/libc++abi1-X.Y.links.in b/debian/libc++abi1-X.Y.links.in index 8d294987..a57ef065 100644 --- a/debian/libc++abi1-X.Y.links.in +++ b/debian/libc++abi1-X.Y.links.in @@ -1,2 +1,2 @@ -usr/lib/llvm-@LLVM_VERSION@/lib/@DEB_HOST_MULTIARCH@/libc++abi.so.1.0 /usr/lib/@DEB_HOST_MULTIARCH@/libc++abi.so.1.0 +usr/lib/llvm-@LLVM_VERSION@/lib/libc++abi.so.1.0 /usr/lib/@DEB_HOST_MULTIARCH@/libc++abi.so.1.0 /usr/lib/@DEB_HOST_MULTIARCH@/libc++abi.so.1.0 /usr/lib/@DEB_HOST_MULTIARCH@/libc++abi.so.1 diff --git a/debian/rules b/debian/rules index 50114d6c..c5220512 100755 --- a/debian/rules +++ b/debian/rules @@ -846,7 +846,6 @@ override_dh_installdeb: # Remove auto generated python pyc find $(CURDIR)/debian/llvm-$(LLVM_VERSION)-tools/usr/lib/llvm-$(LLVM_VERSION)/ -name '*.pyc' | xargs -r rm -f - ifeq (${RUN_TEST},yes) # List of the archs we know we have 100 % tests working ARCH_LLVM_TEST_OK := i386 amd64