nushell: try again to fix i686 build by exporting RUSTFLAGS earlier and adding a flag

packages/nushell/build.sh

@@ -11,6 +11,6 @@ TERMUX_PKG_BLACKLISTED_ARCHES="x86_64"
 
 termux_step_pre_configure() {
 	if [ $TERMUX_ARCH = "i686" ]; then
-		LDFLAGS+=" -latomic"
+		RUSTFLAGS=" -C link-arg=-latomic"
 	fi
 }

scripts/build/setup/termux_setup_rust.sh

@@ -5,8 +5,6 @@ termux_setup_rust() {
 		CARGO_TARGET_NAME=$TERMUX_ARCH-linux-android
 	fi
 
-	export RUSTFLAGS="-C link-arg=-Wl,-rpath=$TERMUX_PREFIX/lib -C link-arg=-Wl,--enable-new-dtags"
-
 	if [ "$TERMUX_ON_DEVICE_BUILD" = "true" ]; then
 		if [ "$(dpkg-query -W -f '${db:Status-Status}\n' rust 2>/dev/null)" != "installed" ]; then
 			echo "Package 'rust' is not installed."

scripts/build/termux_step_setup_toolchain.sh

@@ -90,6 +90,7 @@ termux_step_setup_toolchain() {
 	export CGO_LDFLAGS="${LDFLAGS/-Wl,-z,relro,-z,now/}"
 	CGO_LDFLAGS="${LDFLAGS/-static-openmp/}"
 	export CGO_CFLAGS="-I$TERMUX_PREFIX/include"
+	export RUSTFLAGS="-C link-arg=-Wl,-rpath=$TERMUX_PREFIX/lib -C link-arg=-Wl,--enable-new-dtags"
 
 	export ac_cv_func_getpwent=no
 	export ac_cv_func_getpwnam=no