From: Eneas U de Queiroz Date: Fri, 10 Feb 2023 15:02:06 +0000 (-0300) Subject: toolchain: wrapper.sh: fix TOOLCHAIN_SYSROOT path X-Git-Url: http://git.openwrt.org/?a=commitdiff_plain;h=9a49e257d638b2bb84e050e26942f496c14fa6f5;p=openwrt%2Fstaging%2Fjow.git toolchain: wrapper.sh: fix TOOLCHAIN_SYSROOT path 62c1740676 changed the location of the script from $(TOOLCHAIN_DIR)/usr to $(TOOLCHAIN_DIR), but the TOOLCHAIN_SYSROOT used in wrapper.sh was still expecting to find the script under usr/bin. Fixes: 62c1740676 toolchain: fix the sysroot mess by getting... Signed-off-by: Eneas U de Queiroz --- diff --git a/target/toolchain/files/wrapper.sh b/target/toolchain/files/wrapper.sh index 6a0cdfff6c..0b06343f09 100755 --- a/target/toolchain/files/wrapper.sh +++ b/target/toolchain/files/wrapper.sh @@ -46,7 +46,7 @@ TOOLCHAIN_BIN_DIR="$REALNAME_DIR/" 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