diff --git a/debian/changelog b/debian/changelog index 5f778dff..5dc3db67 100644 --- a/debian/changelog +++ b/debian/changelog @@ -92,7 +92,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/qualify-clang.sh b/debian/qualify-clang.sh index cd511981..0edb2596 100755 --- a/debian/qualify-clang.sh +++ b/debian/qualify-clang.sh @@ -952,7 +952,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 diff --git a/debian/rules b/debian/rules index ae00c59f..760cb138 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