Merge branch '13' into '13'

Explicitly link against -latomic on all ports, not only the Linux ones

See merge request pkg-llvm-team/llvm-toolchain!78
This commit is contained in:
Sylvestre Ledru 2022-01-12 08:56:34 +00:00
commit 02063451dd
2 changed files with 7 additions and 1 deletions

6
debian/changelog vendored
View File

@ -1,3 +1,9 @@
llvm-toolchain-13 (1:13.0.1~+rc1-1~exp5) UNRELEASED; urgency=medium
* Explicitly link against -latomic on all ports, not only the Linux ones.
-- Samuel Thibault <sthibault@debian.org> Mon, 10 Jan 2022 21:36:34 +0100
llvm-toolchain-13 (1:13.0.1~+rc1-1~exp4) experimental; urgency=medium llvm-toolchain-13 (1:13.0.1~+rc1-1~exp4) experimental; urgency=medium
* Fix the cmake file with the mlir introducing * Fix the cmake file with the mlir introducing

2
debian/rules vendored
View File

@ -96,7 +96,7 @@ ifneq (,$(filter $(DEB_HOST_ARCH),sparc sparc64))
STAGE_1_CMAKE_EXTRA += -DLLVM_PARALLEL_LINK_JOBS=4 STAGE_1_CMAKE_EXTRA += -DLLVM_PARALLEL_LINK_JOBS=4
endif endif
ifneq (,$(filter $(DEB_HOST_ARCH),i386 armel mipsel powerpc powerpcspe riscv64)) ifneq (,$(filter $(DEB_HOST_ARCH_CPU),i386 armel mipsel powerpc powerpcspe riscv64))
# For some reason, in the stage2 build, when clang is used to compile # 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 # itself. The atomic detection is failing on armel and riscv64. Forcing the inclusion
# everywhere and in all stages # everywhere and in all stages