From: Peter Michael Green <plugwash@raspbian.org>
Date: Tue, 2 Nov 2021 17:29:10 +0000 (+0000)
Subject: Try a different method for disabling compiler-rt builtins.
X-Git-Tag: archive/raspbian/1%12.0.1-16+rpi1~2
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=ffe995b147b59bd1fde7a76b2c1a7b6a67bd5a50;p=llvm-toolchain-12.git

Try a different method for disabling compiler-rt builtins.
---

diff --git a/debian/rules b/debian/rules
index 1b0cec509a..f454bbbdae 100755
--- a/debian/rules
+++ b/debian/rules
@@ -71,7 +71,7 @@ STAGE_2_LDFLAGS = $(LDFLAGS) $(LDFLAGS_EXTRA)
 # collect additional cmake options for toolchain build configuration
 STAGE_1_CMAKE_EXTRA =
 STAGE_2_CMAKE_EXTRA =
-STAGE_ALL_CMAKE_EXTRA = -DCOMPILER_RT_BUILD_BUILTINS=OFF
+STAGE_ALL_CMAKE_EXTRA = 
 # toolchain config-only var combining all stage 1 cmake options
 CMAKE_EXTRA = $(STAGE_1_CMAKE_EXTRA) $(STAGE_ALL_CMAKE_EXTRA)
 # toolchain config-only var prepending BOOTSTRAP_ to all stage 2 cmake options
@@ -146,6 +146,9 @@ ifneq (,$(findstring $(DEB_HOST_ARCH),armhf))
 # https://wiki.debian.org/ArmHardFloatPort#Minimum_CPU_.26_FPU
   CFLAGS_EXTRA += -march=armv6 -mfpu=vfpv2
   CXXFLAGS_EXTRA += -march=armv6 -mfpu=vfpv2
+  STAGE_ALL_CMAKE_EXTRA += -DCOMPILER_RT_BUILD_BUILTINS=OFF
+  COMPILER_RT_USE_BUILTINS_LIBRARY := OFF
+  LIBCXX_USE_COMPILER_RT := OFF
 endif
 
 ifneq (,$(filter $(DEB_HOST_ARCH),i386))