From 3d0e431f14262ebcda05ca0b85f82a06359f0a6d Mon Sep 17 00:00:00 2001 From: Samuel Thibault Date: Mon, 10 Jan 2022 21:37:19 +0100 Subject: [PATCH] Explicitly link against -latomic on all ports, not only the Linux ones (cherry picked from commit 43d03058ff79806ab0ac1227e74f154493f78638) --- debian/changelog | 4 ++++ debian/rules | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index b9e672bf..b6de9aa9 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,10 +1,14 @@ llvm-toolchain-snapshot (1:14~++20220116120030+696f9706f34d-1~exp1) UNRELEASED; urgency=medium + [ Sylvestre Ledru ] * Remove lldb-instr to match upstream change 4609e30f5001cfcba59d1f2f90ce72ebfda6e61f * Ugly workaround to enable scan-build on runtimes debian/patches/use-scan-build-runtimes.diff * Python 2 => 3 to unbreak the 'scanbuild_py_makefile.txt' test + [ Samuel Thibault ] + * Explicitly link against -latomic on hurd-i386 as well. + -- Sylvestre Ledru Sun, 16 Jan 2022 00:00:49 +0100 llvm-toolchain-snapshot (1:14~++20220107114130+3a604fdbcd5f-1~exp1) experimental; urgency=medium diff --git a/debian/rules b/debian/rules index 28627833..06bf86a7 100755 --- a/debian/rules +++ b/debian/rules @@ -96,7 +96,7 @@ ifneq (,$(filter $(DEB_HOST_ARCH),sparc sparc64)) STAGE_1_CMAKE_EXTRA += -DLLVM_PARALLEL_LINK_JOBS=4 endif -ifneq (,$(filter $(DEB_HOST_ARCH),i386 armel mipsel powerpc powerpcspe riscv64)) +ifneq (,$(filter $(DEB_HOST_ARCH),i386 hurd-i386 kfreebsd-i386 armel mipsel powerpc powerpcspe riscv64)) # For some reason, in the stage2 build, when clang is used to compile # itself. The atomic detection is failing on armel and riscv64. Forcing the inclusion # everywhere and in all stages