From 4baff3044a1a52cad870d6316b6c429e992bfaca Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Mon, 26 Jun 2023 10:13:30 +0200 Subject: [PATCH] only pass no-symbolic if it exists in ld.gold --- debian/changelog | 6 ++++++ debian/rules | 11 ++++++++--- 2 files changed, 14 insertions(+), 3 deletions(-) diff --git a/debian/changelog b/debian/changelog index f2369481..64abe7bd 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +llvm-toolchain-15 (1:15.0.7-6) UNRELEASED; urgency=medium + + * Only pass -Bno-symbolic if it exists + + -- Sylvestre Ledru Mon, 26 Jun 2023 10:13:40 +0200 + llvm-toolchain-15 (1:15.0.7-5) unstable; urgency=medium [ Graham Inggs ] diff --git a/debian/rules b/debian/rules index bc0a9d65..774e3d9b 100755 --- a/debian/rules +++ b/debian/rules @@ -177,9 +177,6 @@ ifneq (,$(filter $(DEB_HOST_ARCH),i386)) STAGE_ALL_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 @@ -422,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