X-Git-Url: https://git.distorted.org.uk/~mdw/termux-packages/blobdiff_plain/e72b39771441ec1a0948ef53f146671ad9b9b812..acf19a7ba28b084415182b32801b8562065ffcd8:/build-package.sh?ds=sidebyside

diff --git a/build-package.sh b/build-package.sh
index 7487f4cd..36b3a563 100755
--- a/build-package.sh
+++ b/build-package.sh
@@ -365,7 +365,7 @@ termux_step_start_build() {
 	TERMUX_STANDALONE_TOOLCHAIN="$TERMUX_TOPDIR/_lib/${TERMUX_NDK_VERSION}-${TERMUX_ARCH}-${TERMUX_PKG_API_LEVEL}"
 	# Bump the below version if a change is made in toolchain setup to ensure
 	# that everyone gets an updated toolchain:
-	TERMUX_STANDALONE_TOOLCHAIN+="-v12"
+	TERMUX_STANDALONE_TOOLCHAIN+="-v14"
 
 	if [ -n "${TERMUX_PKG_BLACKLISTED_ARCHES:=""}" ] && [ "$TERMUX_PKG_BLACKLISTED_ARCHES" != "${TERMUX_PKG_BLACKLISTED_ARCHES/$TERMUX_ARCH/}" ]; then
 		echo "Skipping building $TERMUX_PKG_NAME for arch $TERMUX_ARCH"
@@ -571,7 +571,9 @@ termux_step_setup_toolchain() {
 	if [ -n "$TERMUX_DEBUG" ]; then
 		CFLAGS+=" -g3 -O1 -fstack-protector --param ssp-buffer-size=4 -D_FORTIFY_SOURCE=2"
 	else
-		if [ "$TERMUX_PKG_CLANG" = "no" ]; then
+		if [ "$TERMUX_PKG_CLANG" = "no" ] || [ "$TERMUX_PKG_NAME" = "ruby" -a "$TERMUX_ARCH" = arm ]; then
+			# The exception for "ruby" and arm exception is to avoid -Oz for ruby, which causes
+			# segmentation fault on 32-bit arm with NDK r15c and ruby 2.4.2 (#1520).
 			CFLAGS+=" -Os"
 		else
 			# -Oz seems good for clang, see https://github.com/android-ndk/ndk/issues/133