From: Jo-Philipp Wich Date: Sat, 7 Feb 2015 21:01:37 +0000 (+0000) Subject: toolchain: respect CONFIG_VERSION_FILENAMES and add host system suffix X-Git-Url: http://git.openwrt.org/?p=openwrt%2Fstaging%2Fwigyori.git;a=commitdiff_plain;h=e9c10a0c8e4511e19a31f983162c171ab4dccba2 toolchain: respect CONFIG_VERSION_FILENAMES and add host system suffix Signed-off-by: Jo-Philipp Wich SVN-Revision: 44311 --- diff --git a/target/toolchain/Makefile b/target/toolchain/Makefile index 6e60a08231..67c908530f 100644 --- a/target/toolchain/Makefile +++ b/target/toolchain/Makefile @@ -13,10 +13,7 @@ include $(INCLUDE_DIR)/host.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:=OpenWrt-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 \