sergiotarxz/termux-packages
sergiotarxz/termux-packages
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

Browse Source
This commit is contained in:
Butta 2021-07-15 23:34:56 +05:30
parent 39f1d4ad37
commit 167739f5b8
3 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
packages/nushell/build.sh
View File

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

2
scripts/build/setup/termux_setup_rust.sh
View File

@ -5,8 +5,6 @@ termux_setup_rust() {
CARGO_TARGET_NAME=$TERMUX_ARCH-linux-android CARGO_TARGET_NAME=$TERMUX_ARCH-linux-android
fi 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 [ "$TERMUX_ON_DEVICE_BUILD" = "true" ]; then
if [ "$(dpkg-query -W -f '${db:Status-Status}\n' rust 2>/dev/null)" != "installed" ]; then if [ "$(dpkg-query -W -f '${db:Status-Status}\n' rust 2>/dev/null)" != "installed" ]; then
echo "Package 'rust' is not installed." echo "Package 'rust' is not installed."

1
scripts/build/termux_step_setup_toolchain.sh
View File

@ -90,6 +90,7 @@ termux_step_setup_toolchain() {
export CGO_LDFLAGS="${LDFLAGS/-Wl,-z,relro,-z,now/}" export CGO_LDFLAGS="${LDFLAGS/-Wl,-z,relro,-z,now/}"
CGO_LDFLAGS="${LDFLAGS/-static-openmp/}" CGO_LDFLAGS="${LDFLAGS/-static-openmp/}"
export CGO_CFLAGS="-I$TERMUX_PREFIX/include" 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_getpwent=no
export ac_cv_func_getpwnam=no export ac_cv_func_getpwnam=no