valgrind: Fix arm build by avoiding -mthumb

diff --git a/packages/valgrind/build.sh b/packages/valgrind/build.sh
index 379f9e4..eeff1ab 100644 (file)
--- a/packages/valgrind/build.sh
+++ b/packages/valgrind/build.sh
@@ -11,8 +11,12 @@ TERMUX_PKG_BLACKLISTED_ARCHES="x86_64"
 # "error: the clang compiler does not support '-mcpu=cortex-a8'":
 TERMUX_PKG_CLANG=no
 
-if [ "$TERMUX_ARCH" == "arm" ]; then
-       # valgrind doesn't like arm; armv7 works, though.
-       TERMUX_PKG_EXTRA_CONFIGURE_ARGS+=" --host=armv7-linux-androideabi"
-fi
-
+termux_step_pre_configure() {
+       if [ "$TERMUX_ARCH" == "arm" ]; then
+               # valgrind doesn't like arm; armv7 works, though.
+               TERMUX_PKG_EXTRA_CONFIGURE_ARGS+=" --host=armv7-linux-androideabi"
+               # http://lists.busybox.net/pipermail/buildroot/2013-November/082270.html:
+               # "valgrind uses inline assembly that is not Thumb compatible":
+               CFLAGS=${CFLAGS/-mthumb/}
+       fi
+}