target/sdk: Fix filename with external toolchain

[librecmc/librecmc.git] / target / sdk / Makefile

diff --git a/target/sdk/Makefile b/target/sdk/Makefile
index 9e8749b080f9dca904c0c32e5cfd1cff4810cc7e..012b597c8453ae9d757705fd2e99d5821e427b82 100644 (file)
--- a/target/sdk/Makefile
+++ b/target/sdk/Makefile
@@ -12,10 +12,7 @@ include $(INCLUDE_DIR)/version.mk
 
 override MAKEFLAGS=
 
-PKG_OS:=$(word 2,$(subst -, ,$(shell $(HOSTCC) -dumpmachine)))
-PKG_CPU:=$(word 1,$(subst -, ,$(shell $(HOSTCC) -dumpmachine)))
-
-SDK_NAME:=OpenWrt-SDK-$(if $(CONFIG_VERSION_FILENAMES),$(VERSION_NUMBER)-)$(BOARD)-for-$(PKG_OS)-$(PKG_CPU)-gcc-$(GCCV)_$(LIBC)-$(LIBCV)
+SDK_NAME:=$(VERSION_DIST)-SDK-$(if $(CONFIG_VERSION_FILENAMES),$(VERSION_NUMBER)-)$(BOARD)$(if $(SUBTARGET),-$(SUBTARGET))$(if $(GCCV),_gcc-$(GCCV))$(DIR_SUFFIX).$(HOST_OS)-$(HOST_ARCH)
 SDK_BUILD_DIR:=$(BUILD_DIR)/$(SDK_NAME)
 
 STAGING_SUBDIR_HOST := staging_dir/host
@@ -101,6 +98,7 @@ $(BIN_DIR)/$(SDK_NAME).tar.bz2: clean
                $(TOPDIR)/.config \
                ./files/Config.in \
                ./files/Makefile \
+               ./files/include/prepare.mk \
                ./files/README.SDK \
                $(SDK_BUILD_DIR)/
        $(CP) \