X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/12c49b6a6adbbcb0c7a19119c8a8c94b5f025f79..f6d79ced81e5fff18e83d28c59da8ba079c2ba54:/toolchain/binutils/Makefile?ds=sidebyside

diff --git a/toolchain/binutils/Makefile b/toolchain/binutils/Makefile
index b3a68893b..2a881f83d 100644
--- a/toolchain/binutils/Makefile
+++ b/toolchain/binutils/Makefile
@@ -7,8 +7,7 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=binutils
-PKG_VERSION:=$(strip $(subst ",, $(CONFIG_BINUTILS_VERSION)))
-#"))
+PKG_VERSION:=$(call qstrip,$(CONFIG_BINUTILS_VERSION))
 
 PKG_SOURCE_URL:=http://ftp.gnu.org/gnu/binutils/ \
 	ftp://gatekeeper.dec.com/pub/GNU/ \
@@ -21,10 +20,14 @@ PKG_SOURCE:=binutils-$(PKG_VERSION).tar.bz2
 PATCH_DIR:=./patches/$(PKG_VERSION)
 STAGING_DIR_HOST:=$(TOOLCHAIN_DIR)
 BUILD_DIR_HOST:=$(BUILD_DIR_TOOLCHAIN)
+override CONFIG_AUTOREBUILD=
 
 include $(INCLUDE_DIR)/host-build.mk
 
+EXTRA_TARGET=$(if $(CONFIG_EXTRA_TARGET_ARCH),--enable-targets=$(call qstrip,$(CONFIG_EXTRA_TARGET_ARCH_NAME))-linux-uclibc)
+
 define Build/Configure
+	$(CP) $(SCRIPT_DIR)/config.{guess,sub} $(PKG_BUILD_DIR)/
 	(cd $(PKG_BUILD_DIR); \
 		./configure \
 		--prefix=$(STAGING_DIR_HOST) \
@@ -33,6 +36,9 @@ define Build/Configure
 		--target=$(REAL_GNU_TARGET_NAME) \
 		--disable-werror \
 		--disable-nls \
+		$(EXTRA_TARGET) \
+		$(SOFT_FLOAT_CONFIG_OPTION) \
+		$(call qstrip,$(CONFIG_EXTRA_BINUTILS_CONFIG_OPTIONS)) \
 	);
 endef