From b1fb41d2bdc51af05bfe27946f913dee09bb26e9 Mon Sep 17 00:00:00 2001
From: "Yann E. MORIN\"" <yann.morin.1998@anciens.enib.fr>
Date: Thu, 15 May 2008 21:00:52 +0000
Subject: Backport #634 from trunk:   Better configure binutils, both for host
 and target.

 /branches/1.1/scripts/build/binutils.sh |   23    15     8     0 +++++++++++++++--------
 1 file changed, 15 insertions(+), 8 deletions(-)

diff --git a/scripts/build/binutils.sh b/scripts/build/binutils.sh
index 2de697d..29f4fb7 100644
--- a/scripts/build/binutils.sh
+++ b/scripts/build/binutils.sh
@@ -40,7 +40,10 @@ do_binutils() {
         --target=${CT_TARGET}                       \
         --prefix=${CT_PREFIX_DIR}                   \
         --disable-nls                               \
+        --disable-multilib                          \
+        --disable-werror                            \
         ${binutils_opts}                            \
+        ${CT_ARCH_WITH_FLOAT}                       \
         ${CT_BINUTILS_EXTRA_CONFIG}                 \
         ${BINUTILS_SYSROOT_ARG}                     2>&1 |CT_DoLog ALL
 
@@ -80,14 +83,18 @@ do_binutils_target() {
         CT_Pushd "${CT_BUILD_DIR}/build-binutils-for-target"
 
         CT_DoLog EXTRA "Configuring binutils for target"
-        "${CT_SRC_DIR}/${CT_BINUTILS_FILE}/configure"       \
-            --build=${CT_BUILD}                             \
-            --host=${CT_TARGET}                             \
-            --target=${CT_TARGET}                           \
-            --prefix=/usr                                   \
-            --enable-shared --enable-static                 \
-            ${CT_BINUTILS_EXTRA_CONFIG}                     \
-            --disable-nls                                   2>&1 |CT_DoLog ALL
+        "${CT_SRC_DIR}/${CT_BINUTILS_FILE}/configure"   \
+            --build=${CT_BUILD}                         \
+            --host=${CT_TARGET}                         \
+            --target=${CT_TARGET}                       \
+            --prefix=/usr                               \
+            --disable-werror                            \
+            --enable-shared                             \
+            --enable-static                             \
+            --disable-nls                               \
+            --disable-multilib                          \
+            ${CT_ARCH_WITH_FLOAT}                       \
+            ${CT_BINUTILS_EXTRA_CONFIG}                 2>&1 |CT_DoLog ALL
 
         build_targets=$(echo "${targets}" |sed -r -e 's/(^| +)/\1all-/g;')
         install_targets=$(echo "${targets}" |sed -r -e 's/(^| +)/\1install-/g;')
-- 
cgit v0.10.2-6-g49f6