From: Jo-Philipp Wich Date: Tue, 29 Dec 2020 00:06:43 +0000 (+0100) Subject: sdk: invoke bundle-libraries.sh w/o buildroot dirs in $PATH X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=7e4585e59362b581cedcbd852036789f713ae236;p=openwrt%2Fstaging%2Frobimarko.git sdk: invoke bundle-libraries.sh w/o buildroot dirs in $PATH Invoke bundle-libraries.sh with any buildroot related directory entries removed from $PATH to avoid picking up cross versions of utilities like ldd which will not properly work when used against host executables. This should fix executable bundling for glibc-target SDKs. Signed-off-by: Jo-Philipp Wich --- diff --git a/target/sdk/Makefile b/target/sdk/Makefile index caec7178e9..d7e10a9bd8 100644 --- a/target/sdk/Makefile +++ b/target/sdk/Makefile @@ -20,6 +20,9 @@ STAGING_SUBDIR_HOST := staging_dir/host STAGING_SUBDIR_TARGET := staging_dir/$(TARGET_DIR_NAME) STAGING_SUBDIR_TOOLCHAIN := staging_dir/toolchain-$(ARCH)$(ARCH_SUFFIX)_gcc-$(GCCV)_$(LIBC)$(if $(CONFIG_arm),_eabi) +BUNDLER_PATH := $(subst $(space),:,$(filter-out $(TOPDIR)/%,$(subst :,$(space),$(PATH)))) +BUNDLER_COMMAND := PATH=$(BUNDLER_PATH) $(XARGS) $(SCRIPT_DIR)/bundle-libraries.sh $(SDK_BUILD_DIR)/$(STAGING_SUBDIR_HOST) + EXCLUDE_DIRS:= \ */stamp \ */stampfiles \ @@ -104,7 +107,7 @@ $(BIN_DIR)/$(SDK_NAME).tar.xz: clean (cd $(SDK_BUILD_DIR); find $(STAGING_SUBDIR_HOST)/bin $(STAGING_SUBDIR_HOST)/usr/bin \ $(STAGING_SUBDIR_TOOLCHAIN)/bin $(STAGING_SUBDIR_TOOLCHAIN)/*/bin $(STAGING_SUBDIR_TOOLCHAIN)/libexec \ $(KDIR_BASE) \ - -type f | $(XARGS) $(SCRIPT_DIR)/bundle-libraries.sh $(SDK_BUILD_DIR)/$(STAGING_SUBDIR_HOST)) + -type f | $(BUNDLER_COMMAND)) @-( \ find \