From d50b20b2e350b385d686181e85d23f23c430b5c4 Mon Sep 17 00:00:00 2001 From: Nikita Ostrenkov Date: Sat, 7 Mar 2026 16:10:34 +0300 Subject: [PATCH] sdk: use TOOLCHAIN_DIR_NAME for STAGING_SUBDIR_TOOLCHAIN Like a STAGING_SUBDIR_TARGET which uses TARGET_DIR_NAME, we can use TOOLCHAIN_DIR_NAME for STAGING_SUBDIR_TOOLCHAIN to avoid code duplication. Signed-off-by: Nikita Ostrenkov Link: https://github.com/openwrt/openwrt/pull/22315 Signed-off-by: Christian Marangi --- target/sdk/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/target/sdk/Makefile b/target/sdk/Makefile index 58dd74e912..062214d8ea 100644 --- a/target/sdk/Makefile +++ b/target/sdk/Makefile @@ -18,7 +18,7 @@ SDK_BUILD_DIR:=$(BUILD_DIR)/$(SDK_NAME) 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) +STAGING_SUBDIR_TOOLCHAIN := staging_dir/$(TOOLCHAIN_DIR_NAME) 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)