uclient: update to Git HEAD (2024-04-19)

[openwrt/openwrt.git] / target / toolchain / files / wrapper.sh

diff --git a/target/toolchain/files/wrapper.sh b/target/toolchain/files/wrapper.sh
index 6078d91973396590349066a806541ce82c7cc311..09a9cac928abd9f38e55e4b7ef6e6a0bb415f0e9 100755 (executable)
--- a/target/toolchain/files/wrapper.sh
+++ b/target/toolchain/files/wrapper.sh
@@ -15,10 +15,10 @@
 #
 
 PROGNAME=$0
-REALNAME=$(readlink -f $0)
+REALNAME=$(readlink -f "$0")
 
-REALNAME_BASE=$(basename $REALNAME)
-REALNAME_DIR=$(dirname $REALNAME)
+REALNAME_BASE=$(basename "$REALNAME")
+REALNAME_DIR=$(dirname "$REALNAME")
 
 TARGET_FUNDAMENTAL_ASFLAGS=''
 TARGET_FUNDAMENTAL_CFLAGS=''
@@ -30,7 +30,7 @@ TARGET_TOOLCHAIN_TRIPLET=${REALNAME_BASE%-*}
 BINARY=${PROGNAME##*-}
 
 # Parse our tool name, splitting it at '-' characters.
-IFS=- read -r TOOLCHAIN_ARCH TOOLCHAIN_BUILDROOT TOOLCHAIN_OS TOOLCHAIN_PLATFORM PROGNAME << EOF
+IFS=- read -r _ _ _ TOOLCHAIN_PLATFORM PROGNAME << EOF
 $REALNAME_BASE
 EOF
 
@@ -43,10 +43,11 @@ TOOLCHAIN_BIN_DIR="$REALNAME_DIR/"
 
 # Set the PATH so that our run-time location is first
 # (get_feature is run from the path, so this has to be set)
+export ORIG_PATH=${ORIG_PATH:-$PATH}
 export PATH="$TOOLCHAIN_BIN_DIR":$PATH
 export GCC_HONOUR_COPTS
 
-TOOLCHAIN_SYSROOT="$TOOLCHAIN_BIN_DIR/../.."
+TOOLCHAIN_SYSROOT="$TOOLCHAIN_BIN_DIR/.."
 if [ ! -d "$TOOLCHAIN_SYSROOT" ]; then
        echo "Error: Unable to determine sysroot (looking for $TOOLCHAIN_SYSROOT)!" >&2
        exit 1
@@ -57,8 +58,8 @@ fi
 
 case $TOOLCHAIN_PLATFORM in
        gnu|glibc|uclibc|musl)
-               GCC_SYSROOT_FLAGS="--sysroot=$TOOLCHAIN_SYSROOT -Wl,-rpath=$TOOLCHAIN_SYSROOT/lib:$TOOLCHAIN_SYSROOT/usr/lib"
-               LD_SYSROOT_FLAGS="-rpath=$TOOLCHAIN_SYSROOT/lib:$TOOLCHAIN_SYSROOT/usr/lib"
+               GCC_SYSROOT_FLAGS="--sysroot=$TOOLCHAIN_SYSROOT -Wl,-rpath-link=$TOOLCHAIN_SYSROOT/lib:$TOOLCHAIN_SYSROOT/usr/lib"
+               LD_SYSROOT_FLAGS="-rpath-link=$TOOLCHAIN_SYSROOT/lib:$TOOLCHAIN_SYSROOT/usr/lib"
                ;;
        *)
                GCC_SYSROOT_FLAGS=""
@@ -71,16 +72,16 @@ esac
 #
 case $BINARY in
        cc|gcc|g++|c++|cpp)
-               exec $TARGET_TOOLCHAIN_TRIPLET-$BINARY.bin $GCC_SYSROOT_FLAGS $TARGET_FUNDAMENTAL_CFLAGS $TARGET_ROOTFS_CFLAGS "$@"
+               exec "$TARGET_TOOLCHAIN_TRIPLET-$BINARY.bin" $GCC_SYSROOT_FLAGS $TARGET_FUNDAMENTAL_CFLAGS $TARGET_ROOTFS_CFLAGS "$@"
                ;;
        ld)
-               exec $TARGET_TOOLCHAIN_TRIPLET-$BINARY.bin $LD_SYSROOT_FLAGS $TARGET_FUNDAMENTAL_LDFLAGS "$@"
+               exec "$TARGET_TOOLCHAIN_TRIPLET-$BINARY.bin" $LD_SYSROOT_FLAGS $TARGET_FUNDAMENTAL_LDFLAGS "$@"
                ;;
        as)
-               exec $TARGET_TOOLCHAIN_TRIPLET-$BINARY.bin $TARGET_FUNDAMENTAL_ASFLAGS "$@"
+               exec "$TARGET_TOOLCHAIN_TRIPLET-$BINARY.bin" $TARGET_FUNDAMENTAL_ASFLAGS "$@"
                ;;
        *)
-               exec $TARGET_TOOLCHAIN_TRIPLET-$BINARY.bin "$@"
+               exec "$TARGET_TOOLCHAIN_TRIPLET-$BINARY.bin" "$@"
                ;;
 esac