gcc: always explicitly link against libstdc++, fixes build errors on some hosts that...

[openwrt.git] / toolchain / binutils / Makefile

diff --git a/toolchain/binutils/Makefile b/toolchain/binutils/Makefile
index 10902df..77f1baf 100644 (file)
--- a/toolchain/binutils/Makefile
+++ b/toolchain/binutils/Makefile
@@ -1,5 +1,5 @@
-# 
-# Copyright (C) 2006-2009 OpenWrt.org
+#
+# Copyright (C) 2006-2011 OpenWrt.org

 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.


@@ -8,21 +8,22 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=binutils
 PKG_VERSION:=$(call qstrip,$(CONFIG_BINUTILS_VERSION))
 
 PKG_NAME:=binutils
 PKG_VERSION:=$(call qstrip,$(CONFIG_BINUTILS_VERSION))

+BIN_VERSION:=$(PKG_VERSION)

 
 PKG_SOURCE_URL:=@GNU/binutils/
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
 
 
 PKG_SOURCE_URL:=@GNU/binutils/
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
 

-ifeq ($(PKG_VERSION),2.17)
-  PKG_MD5SUM:=e26e2e06b6e4bf3acf1dc8688a94c0d1
+ifeq ($(PKG_VERSION),2.19.1)
+  PKG_MD5SUM:=09a8c5821a2dfdbb20665bc0bd680791

 endif
 endif

-ifeq ($(PKG_VERSION),2.18)
-  PKG_MD5SUM:=9d22ee4dafa3a194457caf4706f9cf01
+ifeq ($(PKG_VERSION),2.20.1)
+  PKG_MD5SUM:=9cdfb9d6ec0578c166d3beae5e15c4e5

 endif
 endif

-ifeq ($(PKG_VERSION),2.19)
-  PKG_MD5SUM:=17a52219dee5a76c1a9d9b0bfd337d66
+ifeq ($(PKG_VERSION),2.21)
+  PKG_MD5SUM:=c84c5acc9d266f1a7044b51c85a823f5

 endif
 endif

-ifeq ($(PKG_VERSION),2.19.1)
-  PKG_MD5SUM:=09a8c5821a2dfdbb20665bc0bd680791
+ifeq ($(PKG_VERSION),2.21.1)
+  PKG_MD5SUM:=a22801a9cad45c85e9ff6afc10537d72

 endif
 
 PATCH_DIR:=./patches/$(PKG_VERSION)
 endif
 
 PATCH_DIR:=./patches/$(PKG_VERSION)


@@ -33,7 +34,7 @@ include $(INCLUDE_DIR)/toolchain-build.mk
 
 BINUTILS_CONFIGURE:= \
        ./configure \
 
 BINUTILS_CONFIGURE:= \
        ./configure \

-               --prefix=$(TOOLCHAIN_DIR)/usr \
+               --prefix=$(TOOLCHAIN_DIR) \

                --build=$(GNU_HOST_NAME) \
                --host=$(GNU_HOST_NAME) \
                --target=$(REAL_GNU_TARGET_NAME) \
                --build=$(GNU_HOST_NAME) \
                --host=$(GNU_HOST_NAME) \
                --target=$(REAL_GNU_TARGET_NAME) \


@@ -41,8 +42,9 @@ BINUTILS_CONFIGURE:= \
                --disable-multilib \
                --disable-werror \
                --disable-nls \
                --disable-multilib \
                --disable-werror \
                --disable-nls \

+               $(GRAPHITE_CONFIGURE) \

                $(SOFT_FLOAT_CONFIG_OPTION) \
                $(SOFT_FLOAT_CONFIG_OPTION) \

-               $(call qstrip,$(CONFIG_EXTRA_BINUTILS_CONFIG_OPTIONS)) \
+               $(call qstrip,$(CONFIG_EXTRA_BINUTILS_CONFIG_OPTIONS)) 

 
 ifneq ($(CONFIG_SSP_SUPPORT),)
   BINUTILS_CONFIGURE+= \
 
 ifneq ($(CONFIG_SSP_SUPPORT),)
   BINUTILS_CONFIGURE+= \


@@ -70,12 +72,12 @@ define Host/Configure
 endef
 
 define Host/Compile
 endef
 
 define Host/Compile

-       $(MAKE) -C $(HOST_BUILD_DIR) all
+       $(MAKE) $(TOOLCHAIN_JOBS) -C $(HOST_BUILD_DIR) all

 endef
 
 define Host/Install
        $(MAKE) -C $(HOST_BUILD_DIR) install
 endef
 
 define Host/Install
        $(MAKE) -C $(HOST_BUILD_DIR) install

-       $(CP) $(TOOLCHAIN_DIR)/usr/bin/$(REAL_GNU_TARGET_NAME)-readelf $(REAL_STAGING_DIR_HOST)/bin/readelf
+       $(CP) $(TOOLCHAIN_DIR)/bin/$(REAL_GNU_TARGET_NAME)-readelf $(REAL_STAGING_DIR_HOST)/bin/readelf

 endef
 
 define Host/Clean
 endef
 
 define Host/Clean