X-Git-Url: http://git.openwrt.org/?a=blobdiff_plain;f=target%2Ftoolchain%2FMakefile;h=08e716660bc93af0bc30e1620194fd106fe8f8c3;hb=2d9b821198d616697d725eb81a276e14d88ecfa6;hp=6e60a08231ac65055ca66c3d78f38aaae7f0108f;hpb=cd8d2d3d8ebda5968b0ac81647a900d77ad7ed8f;p=openwrt%2Fsvn-archive%2Farchive.git

diff --git a/target/toolchain/Makefile b/target/toolchain/Makefile
index 6e60a08231..08e716660b 100644
--- a/target/toolchain/Makefile
+++ b/target/toolchain/Makefile
@@ -10,13 +10,11 @@
 include $(TOPDIR)/rules.mk
 include $(INCLUDE_DIR)/kernel.mk
 include $(INCLUDE_DIR)/host.mk
+include $(INCLUDE_DIR)/version.mk
 
 override MAKEFLAGS=
 
-PKG_OS:=$(word 2,$(subst -, ,$(shell $(HOSTCC) -dumpmachine)))
-PKG_CPU:=$(word 1,$(subst -, ,$(shell $(HOSTCC) -dumpmachine)))
-
-TOOLCHAIN_NAME:=OpenWrt-Toolchain-$(BOARD)-for-$(ARCH)$(ARCH_SUFFIX)-gcc-$(GCCV)$(DIR_SUFFIX)
+TOOLCHAIN_NAME:=$(VERSION_DIST)-Toolchain-$(if $(CONFIG_VERSION_FILENAMES),$(VERSION_NUMBER)-)$(BOARD)$(if $(SUBTARGET),-$(SUBTARGET))_gcc-$(GCCV)$(DIR_SUFFIX).$(HOST_OS)-$(HOST_ARCH)
 TOOLCHAIN_BUILD_DIR:=$(BUILD_DIR)/$(TOOLCHAIN_NAME)
 EXCLUDE_DIRS:=*/ccache \
 	*/initial \