X-Git-Url: http://git.openwrt.org/?a=blobdiff_plain;f=toolchain%2Fbinutils%2FMakefile;h=0028a02d689354583e383a490e44a321549c8267;hb=98e00f8fdd92174aad58612107fd2cee06fbe036;hp=567f88a8543abb7392e30a91359c98659e0c1cff;hpb=c7bc3ad908c4160ab9120d657b942d128363b828;p=openwrt%2Fstaging%2Fchunkeey.git

diff --git a/toolchain/binutils/Makefile b/toolchain/binutils/Makefile
index 567f88a854..0028a02d68 100644
--- a/toolchain/binutils/Makefile
+++ b/toolchain/binutils/Makefile
@@ -21,8 +21,8 @@ else
   PKG_SOURCE_URL:=@GNU/binutils/
   PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
 
-  ifeq ($(PKG_VERSION),2.20.1)
-    PKG_MD5SUM:=9cdfb9d6ec0578c166d3beae5e15c4e5
+  ifeq ($(PKG_VERSION),2.25.1)
+    PKG_MD5SUM:=ac493a78de4fee895961d025b7905be4
   endif
 endif
 
@@ -41,6 +41,8 @@ BINUTILS_CONFIGURE:= \
 		--host=$(GNU_HOST_NAME) \
 		--target=$(REAL_GNU_TARGET_NAME) \
 		--with-sysroot=$(TOOLCHAIN_DIR) \
+		--enable-deterministic-archives \
+		--enable-plugins \
 		--disable-multilib \
 		--disable-werror \
 		--disable-nls \
@@ -63,8 +65,9 @@ endif
 
 define Host/Prepare
 	$(call Host/Prepare/Default)
-	ln -snf $(PKG_NAME)-$(PKG_VERSION) $(BUILD_DIR_TOOLCHAIN)/$(PKG_NAME)
+	ln -snf $(notdir $(HOST_BUILD_DIR)) $(BUILD_DIR_TOOLCHAIN)/$(PKG_NAME)
 	$(CP) $(SCRIPT_DIR)/config.{guess,sub} $(HOST_BUILD_DIR)/
+	$(SED) 's, " Linaro.*,,' $(HOST_BUILD_DIR)/bfd/version.h
 endef
 
 define Host/Configure
@@ -82,9 +85,11 @@ define Host/Install
 	$(MAKE) -C $(HOST_BUILD_DIR) \
 		prefix=$(TOOLCHAIN_DIR)/initial \
 		install
+	$(MAKE) -C $(HOST_BUILD_DIR) \
+		prefix=$(TOOLCHAIN_DIR) \
+		install
 	$(call FixupLibdir,$(TOOLCHAIN_DIR)/initial)
 	$(RM) $(TOOLCHAIN_DIR)/initial/lib/libiberty.a
-	$(CP) $(TOOLCHAIN_DIR)/initial/. $(TOOLCHAIN_DIR)/
 	$(CP) $(TOOLCHAIN_DIR)/bin/$(REAL_GNU_TARGET_NAME)-readelf $(REAL_STAGING_DIR_HOST)/bin/readelf
 endef