diff --git a/packages/nushell/build.sh b/packages/nushell/build.sh index 37be3b8b3..a8760f400 100644 --- a/packages/nushell/build.sh +++ b/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 } diff --git a/scripts/build/setup/termux_setup_rust.sh b/scripts/build/setup/termux_setup_rust.sh index 6a8a074bb..ce796e714 100644 --- a/scripts/build/setup/termux_setup_rust.sh +++ b/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." diff --git a/scripts/build/termux_step_setup_toolchain.sh b/scripts/build/termux_step_setup_toolchain.sh index ce37b5553..ffc988680 100644 --- a/scripts/build/termux_step_setup_toolchain.sh +++ b/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