Use rpath-link hack on all aarch64 gcc builds

build-package.sh

@@ -440,6 +440,11 @@ termux_step_setup_toolchain() {
 		export CXX=$TERMUX_HOST_PLATFORM-g++
 		LDFLAGS+=" -specs=$TERMUX_SCRIPTDIR/termux.spec"
 		CFLAGS+=" -specs=$TERMUX_SCRIPTDIR/termux.spec"
+		if [ $TERMUX_ARCH = aarch64 ]; then
+			# Currently needed hack.
+			LDFLAGS+=" -Wl,-rpath-link,$TERMUX_PREFIX/lib"
+			LDFLAGS+=" -Wl,-rpath-link,$TERMUX_STANDALONE_TOOLCHAIN/sysroot/usr/lib"
+		fi
 	else
 		export AS=${TERMUX_HOST_PLATFORM}-clang
 		export CC=$TERMUX_HOST_PLATFORM-clang

packages/elfutils/build.sh

@@ -16,12 +16,6 @@ termux_step_pre_configure() {
 	LDFLAGS+=" -lintl"
 	CFLAGS+=" -DTERMUX_EXPOSE_MEMPCPY=1 -Wno-error=unused-value -Wno-error=format-nonliteral -Wno-error"
 
-	if [ $TERMUX_ARCH = aarch64 ]; then
-		# Currently needed hack.
-		LDFLAGS+=" -Wl,-rpath-link,$TERMUX_PREFIX/lib"
-		LDFLAGS+=" -Wl,-rpath-link,$TERMUX_STANDALONE_TOOLCHAIN/sysroot/usr/lib"
-	fi
-
 	# Exposes ACCESSPERMS in <sys/stat.h> which elfutils uses:
 	CFLAGS+=" -D__USE_BSD"