diff --git a/debian/changelog b/debian/changelog
index bd96be3b..54817f05 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -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 ]
diff --git a/debian/rules b/debian/rules
index 9e5d183a..c92a4506 100755
--- a/debian/rules
+++ b/debian/rules
@@ -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