From a3edea1b9136b05edfed95b58ba33a9ff46b6587 Mon Sep 17 00:00:00 2001
From: Nicolas Thill <nico@openwrt.org>
Date: Thu, 8 Jan 2009 01:49:11 +0000
Subject: add support for alternative C libraries (currently only glibc/eglibc)
 other (related) changes: - kernel headers are now installed using "make
 headers_install" on 2.6 - target names now contain an openwrt "vendor" tag
 (e.g. mips-openwrt-linux-gnu) - build directory names now contain gcc/libc
 name/version - default cpu for x86 is now i486 (required to build
 glibc/eglibc)

SVN-Revision: 13931
---
 toolchain/binutils/Makefile | 20 +++++++++++++++++---
 1 file changed, 17 insertions(+), 3 deletions(-)

(limited to 'toolchain/binutils/Makefile')

diff --git a/toolchain/binutils/Makefile b/toolchain/binutils/Makefile
index 3a4e7e8..db3ea75 100644
--- a/toolchain/binutils/Makefile
+++ b/toolchain/binutils/Makefile
@@ -23,20 +23,28 @@ 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)
+EXTRA_TARGET=$(if $(CONFIG_EXTRA_TARGET_ARCH),--enable-targets=$(call qstrip,$(CONFIG_EXTRA_TARGET_ARCH_NAME))-linux-$(TARGET_SUFFIX))
 
-define Build/Configure
+define Build/Prepare
+	$(call Build/Prepare/Default)
+	ln -snf $(PKG_NAME)-$(PKG_VERSION) $(BUILD_DIR_TOOLCHAIN)/$(PKG_NAME)
 	$(CP) $(SCRIPT_DIR)/config.{guess,sub} $(PKG_BUILD_DIR)/
+endef
+
+define Build/Configure
 	(cd $(PKG_BUILD_DIR); \
 		./configure \
-		--prefix=$(STAGING_DIR_HOST) \
+		--prefix=$(TOOLCHAIN_DIR)/usr \
 		--build=$(GNU_HOST_NAME) \
 		--host=$(GNU_HOST_NAME) \
 		--target=$(REAL_GNU_TARGET_NAME) \
+		--with-sysroot=$(TOOLCHAIN_DIR) \
+		--disable-multilib \
 		--disable-werror \
 		--disable-nls \
 		$(EXTRA_TARGET) \
@@ -53,4 +61,10 @@ define Build/Install
 	$(MAKE) -C $(PKG_BUILD_DIR) install
 endef
 
+define Build/Clean
+	rm -rf \
+		$(PKG_BUILD_DIR) \
+		$(BUILD_DIR_TOOLCHAIN)/$(PKG_NAME)
+endef
+
 $(eval $(call HostBuild))
-- 
cgit v1.1