[openwrt/openwrt] toolchain: wrapper.sh: fix TOOLCHAIN_SYSROOT path

LEDE Commits lede-commits at lists.infradead.org
Sun Feb 12 05:56:33 PST 2023


ansuel pushed a commit to openwrt/openwrt.git, branch master:
https://git.openwrt.org/9a49e257d638b2bb84e050e26942f496c14fa6f5

commit 9a49e257d638b2bb84e050e26942f496c14fa6f5
Author: Eneas U de Queiroz <cotequeiroz at gmail.com>
AuthorDate: Fri Feb 10 12:02:06 2023 -0300

    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 <cotequeiroz at gmail.com>
---
 target/toolchain/files/wrapper.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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




More information about the lede-commits mailing list