X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=target%2Ftoolchain%2FMakefile;h=ef2dc68a97e433917f8e9e8f6727e5b28d60c262;hb=4dc7cb792a8e34b6ad97c7b8058c70311a06bd38;hp=0db18d1ac1bcb12f628272c3b3fcf7d0e761314f;hpb=3e747a7f7534d1c7a5ac1b8e58b99a2585cac0c9;p=oweals%2Fopenwrt.git

diff --git a/target/toolchain/Makefile b/target/toolchain/Makefile
index 0db18d1ac1..ef2dc68a97 100644
--- a/target/toolchain/Makefile
+++ b/target/toolchain/Makefile
@@ -9,16 +9,14 @@
 
 include $(TOPDIR)/rules.mk
 include $(INCLUDE_DIR)/kernel.mk
-include $(INCLUDE_DIR)/host.mk
+include $(INCLUDE_DIR)/version.mk
 
 override MAKEFLAGS=
 
-PKG_OS:=$(shell uname -s)
-PKG_CPU:=$(shell uname -m)
-
-TOOLCHAIN_NAME:=OpenWrt-Toolchain-$(BOARD)-for-$(ARCH)$(ARCH_SUFFIX)-gcc-$(GCCV)$(DIR_SUFFIX)
+TOOLCHAIN_NAME:=$(VERSION_DIST_SANITIZED)-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 \
 	*/stamp \
 	*/stampfiles \
 	*/man \
@@ -46,10 +44,20 @@ $(BIN_DIR)/$(TOOLCHAIN_NAME).tar.bz2: clean
 			ln -sf $(REAL_GNU_TARGET_NAME)-wrapper.sh $(REAL_GNU_TARGET_NAME)-$${app} ; \
 		done; \
 	)
+
+	@-( \
+		find \
+			$(TOOLCHAIN_BUILD_DIR)/*/bin \
+			$(TOOLCHAIN_BUILD_DIR)/*/*/bin \
+			$(TOOLCHAIN_BUILD_DIR)/*/libexec \
+			-type f; \
+	) | xargs strip 2>/dev/null >/dev/null
+
 	echo REVISION:="$(REVISION)" > $(TOOLCHAIN_BUILD_DIR)/version.mk
 	find $(TOOLCHAIN_BUILD_DIR) -name .git | $(XARGS) rm -rf
 	find $(TOOLCHAIN_BUILD_DIR) -name .svn | $(XARGS) rm -rf
 	find $(TOOLCHAIN_BUILD_DIR) -name CVS | $(XARGS) rm -rf
+	mkdir -p $(BIN_DIR)
 	(cd $(BUILD_DIR); \
 		tar cfj $@ $(TOOLCHAIN_NAME); \
 	)