disable sanitiser and fuzzer support in compiler-rt.

diff --git a/debian/changelog b/debian/changelog
index 63bf7669653049337be081e56c29c9ea1f7ee330..31b46787f9b8248356a70aeb21e244a05e04a34a 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -45,6 +45,8 @@ llvm-toolchain-16 (1:16.0.6-20+rpi1) trixie-staging; urgency=medium
 
   [changes introduced in llvm-toolchain-16 1:16.0.6-20+rpi1 by Peter Micheal Green]
   * Remove armhf from spirv architecture list, llvm-spirv-16 fails to build on raspbian.
+  * Don't build sanitiser support in compiler_rt on armhf, it fails to link
+    on raspbian.
 
  -- Peter Michael Green <plugwash@raspbian.org>  Sat, 16 Mar 2024 12:15:03 +0000
 

diff --git a/debian/control b/debian/control
index 7423a3264fa6903555fc00aff2ed86b48bb4d349..d298f4292ae01e6c821f2de282c0f03aedff0daa 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -829,7 +829,7 @@ Description: OpenCL C language implementation - development files
 
 Package: libunwind-16
 Section: libs
-Architecture: amd64 arm64 armhf i386 loong64 ppc64el ppc64 riscv64
+Architecture: amd64 arm64 i386 loong64 ppc64el ppc64 riscv64
 Multi-Arch: same
 Depends: ${shlibs:Depends},
  ${misc:Depends}

diff --git a/debian/rules b/debian/rules
index 8985b5c0ac674b474f0570ae5f92da3f9ee6b68e..b892724cbdc72ea30ca91466516ae90487ab5962 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -180,6 +180,8 @@ ifneq (,$(findstring $(DEB_HOST_ARCH),armhf))
 # note: we don't build with "k" in raspbian even though the CPU supports
 # it because armv6k atomics have forward-compatibility problems.
   STAGE_ALL_CMAKE_EXTRA += -DCOMPILER_RT_BUILD_SCUDO_STANDALONE=OFF
+  STAGE_ALL_CMAKE_EXTRA += -DCOMPILER_RT_BUILD_SANITIZERS=OFF
+  STAGE_ALL_CMAKE_EXTRA += -DCOMPILER_RT_BUILD_LIBFUZZER=OFF
 endif
 
 ifneq (,$(filter $(DEB_HOST_ARCH),i386))