Merge remote-tracking branch 'origin/16' into snapshot

This commit is contained in:
Sylvestre Ledru 2023-06-26 10:18:06 +02:00
commit 4d107b8a1d
2 changed files with 18 additions and 2 deletions

6
debian/changelog vendored
View File

@ -248,6 +248,12 @@ llvm-toolchain-snapshot (1:16~++20220731055325+02b3a358926e-1~exp1) experimental
-- Sylvestre Ledru <sylvestre@debian.org> Wed, 27 Jul 2022 21:36:27 +0200
llvm-toolchain-15 (1:15.0.7-6) UNRELEASED; urgency=medium
* Only pass -Bno-symbolic if it exists
-- Sylvestre Ledru <sylvestre@debian.org> Mon, 26 Jun 2023 10:13:40 +0200
llvm-toolchain-15 (1:15.0.7-5) unstable; urgency=medium
[ Graham Inggs ]

14
debian/rules vendored
View File

@ -181,8 +181,10 @@ ifneq (,$(filter $(DEB_HOST_ARCH),i386))
CMAKE_EXTRA += -DLLVM_HOST_TRIPLE=i386-linux-gnu
endif
# https://bugs.launchpad.net/bugs/2016471
STAGE_2_CMAKE_EXTRA += -DLIBOMP_LDFLAGS=-Wl,-Bno-symbolic
ifneq (,$(filter $(DEB_HOST_ARCH),i386))
# Sometimes, i386 needs help with the triple
CMAKE_EXTRA += -DLLVM_HOST_TRIPLE=i386-linux-gnu
endif
ifneq (,$(filter $(DEB_HOST_ARCH),mips64el))
# avoid an issue with search path on mips64el
@ -417,6 +419,14 @@ else
endif
endif
# https://bugs.launchpad.net/bugs/2016471
ifeq (,$(filter-out $(LTO_DISABLE_ARCHS), $(DEB_HOST_ARCH)))
LD_GOLD_SUPPORTS_NO_SYMBOLIC := $(shell ld.gold --help | grep -q -w '-Bno-symbolic' && echo "yes" || echo "no")
ifeq ($(LD_GOLD_SUPPORTS_NO_SYMBOLIC),yes)
STAGE_2_CMAKE_EXTRA += -DLIBOMP_LDFLAGS=-Wl,-Bno-symbolic
endif
endif
DH_OPTIONS=
OCAML_ENABLE= no
OCAML_ARCHS := amd64 arm64 armhf ppc64el riscv64 s390x