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

diff --git a/build-package.sh b/build-package.sh
index d0552b9b..6aed337a 100755
--- a/build-package.sh
+++ b/build-package.sh
@@ -87,7 +87,7 @@ termux_setup_golang() {
 	rm -Rf "$TERMUX_COMMON_CACHEDIR/go" "$TERMUX_BUILDGO_FOLDER"
 	termux_download https://storage.googleapis.com/golang/${TERMUX_GO_VERSION}.${TERMUX_GO_PLATFORM}.tar.gz \
 	                "$TERMUX_BUILDGO_TAR" \
-	                f0f84761a254324ed9076c23fca502eb135ec49c0b752212a6298f317d303438
+			de874549d9a8d8d8062be05808509c09a88a248e77ec14eb77453530829ac02b
 
 	( cd "$TERMUX_COMMON_CACHEDIR"; tar xf "$TERMUX_BUILDGO_TAR"; mv go "$TERMUX_BUILDGO_FOLDER"; rm "$TERMUX_BUILDGO_TAR" )
 }
@@ -574,8 +574,14 @@ termux_step_setup_toolchain() {
 		if [ "$TERMUX_PKG_CLANG" = "no" ]; then
 			CFLAGS+=" -Os"
 		else
-			# -Oz seems good for clang, see https://github.com/android-ndk/ndk/issues/133
-			CFLAGS+=" -Oz"
+			# -Oz seems good for clang, see https://github.com/android-ndk/ndk/issues/133.
+			# However, on arm it has a lot of issues such as #1520, #1680, #1765 and
+			# https://bugs.llvm.org/show_bug.cgi?id=35379, so use so use -Os there for now:
+			if [ $TERMUX_ARCH = arm ]; then
+				CFLAGS+=" -Os"
+			else
+				CFLAGS+=" -Oz"
+			fi
 		fi
 	fi