From 7a22a0e1ff624a738f5b0ac6cec420e498e47ee7 Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Sun, 8 Aug 2021 11:07:52 +0200 Subject: [PATCH 1/3] Don't build libunwind on hurd, armel, powerpc & mipsel --- debian/changelog | 2 +- debian/rules | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index a0d24c68..7facbc21 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,7 +1,7 @@ llvm-toolchain-12 (1:12.0.1-4) UNRELEASED; urgency=medium * Make libunwind-dev depends on libunwind - * Don't build libunwind on armel & mipsel + * Don't build libunwind on hurd, armel, powerpc & mipsel -- Sylvestre Ledru Sun, 08 Aug 2021 10:58:54 +0200 diff --git a/debian/rules b/debian/rules index e3dc5078..3cf10352 100755 --- a/debian/rules +++ b/debian/rules @@ -190,7 +190,7 @@ endif # Enable libunwind (or not) LIBUNWIND_ENABLE=yes -ifneq (,$(filter $(DEB_HOST_ARCH), s390x armel mipsel)) +ifneq (,$(filter $(DEB_HOST_ARCH), s390x armel mipsel hurd-i386 powerpc)) LIBUNWIND_ENABLE=no else PROJECTS+=;libunwind From c0181fe78db6330dfd61a7f8fbcab4c1573d3ea0 Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Mon, 9 Aug 2021 13:08:04 +0200 Subject: [PATCH 2/3] Fix a test -stdlib=libc++ -unwindlib=libunwind -rtlib=compiler-rt -static-libstdc++ -static-libgcc test.cpp -lpthread -ldl -o test --- debian/qualify-clang.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/debian/qualify-clang.sh b/debian/qualify-clang.sh index e8c74d88..edd73be4 100755 --- a/debian/qualify-clang.sh +++ b/debian/qualify-clang.sh @@ -946,7 +946,8 @@ int main() { std::cout << "Hello World!" << std::endl; } EOF -clang++-$VERSION -stdlib=libc++ -unwindlib=libunwind -rtlib=compiler-rt -static-libstdc++ -static-libgcc test.cpp &> /dev/null || true +clang++-$VERSION -stdlib=libc++ -unwindlib=libunwind -rtlib=compiler-rt -static-libstdc++ -static-libgcc test.cpp -lpthread -ldl -o test +./test clang++-$VERSION -stdlib=libc++ -static-libstdc++ -fuse-ld=lld -l:libc++abi.a test.cpp -o test ./test From c59ca700a1405d5c1f7226c965c8dacf4d617bf8 Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Sun, 8 Aug 2021 11:07:52 +0200 Subject: [PATCH 3/3] Don't build libunwind on hurd, armel, powerpc & mipsel --- debian/changelog | 2 +- debian/rules | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 0f6f8fa9..335372d2 100644 --- a/debian/changelog +++ b/debian/changelog @@ -82,7 +82,7 @@ llvm-toolchain-snapshot (1:13~++20210129063721+010b176cdefb-1~exp1) experimental llvm-toolchain-12 (1:12.0.1-4) UNRELEASED; urgency=medium * Make libunwind-dev depends on libunwind - * Don't build libunwind on armel & mipsel + * Don't build libunwind on hurd, armel, powerpc & mipsel -- Sylvestre Ledru Sun, 08 Aug 2021 10:58:54 +0200 diff --git a/debian/rules b/debian/rules index c8269b67..1a82e4ac 100755 --- a/debian/rules +++ b/debian/rules @@ -194,7 +194,7 @@ endif # Enable libunwind (or not) LIBUNWIND_ENABLE=yes -ifneq (,$(filter $(DEB_HOST_ARCH), s390x armel mipsel)) +ifneq (,$(filter $(DEB_HOST_ARCH), s390x armel mipsel hurd-i386 powerpc)) LIBUNWIND_ENABLE=no else PROJECTS+=;libunwind