Try a different method for disabling compiler-rt builtins.

diff --git a/debian/rules b/debian/rules
index 1b0cec509ae9a89b3ce628ba92e1a34b72a5db03..f454bbbdaeb2d8e5f18288af5f5956093fe313c4 100755 (executable)
--- 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))