From 034874f693566c20d90244570cb6b9e8b2cce74b Mon Sep 17 00:00:00 2001
From: Butta <repo@butta.fastem.com>
Date: Sun, 14 Nov 2021 12:41:53 +0530
Subject: [PATCH] build-package: switch the archiver for debian packages over
 to the one from the NDK, which gets on-device builds working again

Also, remove the binutils-gold dependency for on-device builds, since we switched
everything over to lld now, just like the latest NDK 23.
---
 scripts/build/termux_create_debian_subpackages.sh  | 2 +-
 scripts/build/termux_step_create_debian_package.sh | 2 +-
 scripts/setup-termux.sh                            | 1 -
 3 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/scripts/build/termux_create_debian_subpackages.sh b/scripts/build/termux_create_debian_subpackages.sh
index 14e9f0948..986709290 100644
--- a/scripts/build/termux_create_debian_subpackages.sh
+++ b/scripts/build/termux_create_debian_subpackages.sh
@@ -93,7 +93,7 @@ termux_create_debian_subpackages() {
 		# Create the actual .deb file:
 		TERMUX_SUBPKG_DEBFILE=$TERMUX_OUTPUT_DIR/${SUB_PKG_NAME}${DEBUG}_${TERMUX_PKG_FULLVERSION}_${SUB_PKG_ARCH}.deb
 		test ! -f "$TERMUX_COMMON_CACHEDIR/debian-binary" && echo "2.0" > "$TERMUX_COMMON_CACHEDIR/debian-binary"
-		ar cr "$TERMUX_SUBPKG_DEBFILE" \
+		$AR cr "$TERMUX_SUBPKG_DEBFILE" \
 				   "$TERMUX_COMMON_CACHEDIR/debian-binary" \
 				   "$SUB_PKG_PACKAGE_DIR/control.tar.xz" \
 				   "$SUB_PKG_PACKAGE_DIR/data.tar.xz"
diff --git a/scripts/build/termux_step_create_debian_package.sh b/scripts/build/termux_step_create_debian_package.sh
index d8e6163b7..298e8f529 100644
--- a/scripts/build/termux_step_create_debian_package.sh
+++ b/scripts/build/termux_step_create_debian_package.sh
@@ -46,7 +46,7 @@ termux_step_create_debian_package() {
 	test ! -f "$TERMUX_COMMON_CACHEDIR/debian-binary" && echo "2.0" > "$TERMUX_COMMON_CACHEDIR/debian-binary"
 	TERMUX_PKG_DEBFILE=$TERMUX_OUTPUT_DIR/${TERMUX_PKG_NAME}${DEBUG}_${TERMUX_PKG_FULLVERSION}_${TERMUX_ARCH}.deb
 	# Create the actual .deb file:
-	ar cr "$TERMUX_PKG_DEBFILE" \
+	$AR cr "$TERMUX_PKG_DEBFILE" \
 	       "$TERMUX_COMMON_CACHEDIR/debian-binary" \
 	       "$TERMUX_PKG_PACKAGEDIR/control.tar.xz" \
 	       "$TERMUX_PKG_PACKAGEDIR/data.tar.xz"
diff --git a/scripts/setup-termux.sh b/scripts/setup-termux.sh
index 7c699c597..1274867b2 100755
--- a/scripts/setup-termux.sh
+++ b/scripts/setup-termux.sh
@@ -2,7 +2,6 @@
 
 PACKAGES=""
 # Tier 1: requirements for the core build scripts in scripts/build/.
-PACKAGES+=" binutils-gold"	# Part of binutils which is dependency of clang.
 PACKAGES+=" clang"		# Required for termux-elf-cleaner and C/C++ packages.
 PACKAGES+=" file"		# Used in termux_step_massage().
 PACKAGES+=" gnupg"		# Used in termux_get_repo_files() and build-package.sh.