From 69e359cd2f5f0dac4d4350d6f39725e8ce7f1a03 Mon Sep 17 00:00:00 2001 From: Peter Michael Green Date: Sat, 16 Mar 2024 15:52:12 +0000 Subject: [PATCH] disable sanitiser and fuzzer support in compiler-rt. --- debian/changelog | 2 ++ debian/control | 2 +- debian/rules | 2 ++ 3 files changed, 5 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 63bf766965..31b46787f9 100644 --- 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 Sat, 16 Mar 2024 12:15:03 +0000 diff --git a/debian/control b/debian/control index 7423a3264f..d298f4292a 100644 --- 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 8985b5c0ac..b892724cbd 100755 --- 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)) -- 2.30.2