Use rpath-link hack on all aarch64 gcc builds

diff --git a/build-package.sh b/build-package.sh
index d67f72a2b641d289ee5bb3b20aabace65baf0d5e..a73dd9005e5778b7b54f70d434a70e75d79dd7a3 100755 (executable)
--- a/build-package.sh
+++ b/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"
                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
        else
                export AS=${TERMUX_HOST_PLATFORM}-clang
                export CC=$TERMUX_HOST_PLATFORM-clang

diff --git a/packages/elfutils/build.sh b/packages/elfutils/build.sh
index 5c5faa8295eb82e582ebb4348557e04b29851626..461df54c071c34b6f3104c046d66a4e4d5d636ff 100644 (file)
--- a/packages/elfutils/build.sh
+++ b/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"
 
        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"
 
        # Exposes ACCESSPERMS in <sys/stat.h> which elfutils uses:
        CFLAGS+=" -D__USE_BSD"