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 <ownik.dev@gmail.com>
Link: https://github.com/openwrt/openwrt/pull/22315
Signed-off-by: Christian Marangi <ansuelsmth@gmail.com>
This commit is contained in:
Nikita Ostrenkov 2026-03-07 16:10:34 +03:00 committed by Christian Marangi
parent 24ce1491cc
commit d50b20b2e3
No known key found for this signature in database
GPG key ID: AC001D09ADBFEAD7

View file

@ -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)