X-Git-Url: https://git.distorted.org.uk/~mdw/termux-packages/blobdiff_plain/7b1f1bd35dd9bd3367bf603d97be4f582f8b1b23..1ed71b8a7930f1d07a544b088f56695a49b5a9ad:/build-package.sh

diff --git a/build-package.sh b/build-package.sh
index 1fc0ebdd..6dc2cf9a 100755
--- a/build-package.sh
+++ b/build-package.sh
@@ -154,7 +154,7 @@ termux_step_setup_variables() {
 	: "${TERMUX_ANDROID_BUILD_TOOLS_VERSION:="24.0.1"}"
 	: "${TERMUX_NDK_VERSION:="13"}"
 
-	if [ "x86_64" = "$TERMUX_ARCH" -o "aarch64" = "$TERMUX_ARCH" ]; then
+	if [ "x86_64" = "$TERMUX_ARCH" ] || [ "aarch64" = "$TERMUX_ARCH" ]; then
 		TERMUX_ARCH_BITS=64
 	else
 		TERMUX_ARCH_BITS=32
@@ -170,6 +170,9 @@ termux_step_setup_variables() {
 		termux_error_exit "Wrong NDK version - we need $TERMUX_NDK_VERSION"
 	fi
 
+	# The build tuple that may be given to --build configure flag:
+	TERMUX_BUILD_TUPLE=$(sh "$TERMUX_SCRIPTDIR/scripts/config.guess")
+
 	# We do not put all of build-tools/$TERMUX_ANDROID_BUILD_TOOLS_VERSION/ into PATH
 	# to avoid stuff like arm-linux-androideabi-ld there to conflict with ones from
 	# the standalone toolchain.
@@ -551,7 +554,7 @@ termux_step_setup_toolchain() {
 	chmod +x "$PKG_CONFIG"
 }
 
-# This should not be overridden by packages.
+# Apply all *.patch files for the package. Not to be overridden by packages.
 termux_step_patch_package () {
 	cd "$TERMUX_PKG_SRCDIR"
 	# Suffix patch with ".patch32" or ".patch64" to only apply for these bitnesses:
@@ -563,8 +566,6 @@ termux_step_patch_package () {
 
 	find . -name config.sub -exec chmod u+w '{}' \; -exec cp "$TERMUX_SCRIPTDIR/scripts/config.sub" '{}' \;
 	find . -name config.guess -exec chmod u+w '{}' \; -exec cp "$TERMUX_SCRIPTDIR/scripts/config.guess" '{}' \;
-	# The host tuple that may be given to --host configure flag, but normally autodetected so not needed explicitly
-	TERMUX_HOST_TUPLE=$(sh "$TERMUX_SCRIPTDIR/scripts/config.guess")
 }
 
 # For package scripts to override. Called in $TERMUX_PKG_BUILDDIR.