Revert "Fix the libc++/libc++abi symlink issues after their moves in the triple directory"

This reverts commit d203ac3649.
This commit is contained in:
Sylvestre Ledru 2021-10-15 11:37:55 +02:00
parent 09c30bd80b
commit 00fcfc2bb5
5 changed files with 3 additions and 5 deletions

1
debian/changelog vendored
View File

@ -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 <sylvestre@debian.org> Sun, 26 Sep 2021 16:14:44 +0200

View File

@ -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

View File

@ -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

View File

@ -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

1
debian/rules vendored
View File

@ -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