From 5ad450e40345467cb3889f1b8c197395a528f387 Mon Sep 17 00:00:00 2001
From: "Yann E. MORIN\"" <yann.morin.1998@anciens.enib.fr>
Date: Sat, 24 May 2008 22:49:54 +0000
Subject: [PATCH] Multilib is gone, so don't use it when building gcc.

 /trunk/scripts/build/cc_gcc.sh |    6     1     5     0 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)
---
 scripts/build/cc_gcc.sh | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/scripts/build/cc_gcc.sh b/scripts/build/cc_gcc.sh
index 10ca0222..fa74b14d 100644
--- a/scripts/build/cc_gcc.sh
+++ b/scripts/build/cc_gcc.sh
@@ -221,6 +221,7 @@ do_cc() {
     lang_opt=$(echo "${lang_opt},${CT_CC_LANG_OTHERS}" |sed -r -e 's/,+/,/g; s/,*$//;')
 
     extra_config="--enable-languages=${lang_opt}"
+    extra_config="${extra_config} --disable-multilib"
     extra_config="${extra_config} ${CT_ARCH_WITH_ARCH} ${CT_ARCH_WITH_ABI} ${CT_ARCH_WITH_CPU} ${CT_ARCH_WITH_TUNE} ${CT_ARCH_WITH_FPU} ${CT_ARCH_WITH_FLOAT}"
     [ "${CT_SHARED_LIBS}" = "y" ] || extra_config="${extra_config} --disable-shared"
     if [ "${CT_CC_CXA_ATEXIT}" = "y" ]; then
@@ -228,11 +229,6 @@ do_cc() {
     else
         extra_config="${extra_config} --disable-__cxa_atexit"
     fi
-    if [ "${CT_TARGET_MULTILIB}" = "y" ]; then
-        extra_config="${extra_config} --enable-multilib"
-    else
-        extra_config="${extra_config} --disable-multilib"
-    fi
     [ "${CT_CC_GCC_GMP_MPFR}" = "y" ] && extra_config="${extra_config} --with-gmp=${CT_PREFIX_DIR} --with-mpfr=${CT_PREFIX_DIR}"
 
     CT_DoLog DEBUG "Extra config passed: '${extra_config}'"