From 4bd43c54babe00722e71026a039cdd238fa420f3 Mon Sep 17 00:00:00 2001
From: Caroline Tice <cmtice@google.com>
Date: Tue, 24 Jan 2017 13:35:12 -0800
Subject: [GCC] Add '--disable-multilib' to gcc configuration.

Disabling multilibs fixes the GCC builds for both MIPS and
x86_64.  Without this, the GCC compiler fails to build for those
architectures.

Bug: None
Test: Ran build.py without '--toolchain' flag; it successfully built
all of the compilers.

Change-Id: I018825177e77812a705db54cdad468239e48a87f
---
 build-gcc.sh | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/build-gcc.sh b/build-gcc.sh
index c21accf..24bb0bf 100755
--- a/build-gcc.sh
+++ b/build-gcc.sh
@@ -406,7 +406,8 @@ $BUILD_SRCDIR/configure --target=$ABI_CONFIGURE_TARGET \
                         --with-bugurl=$DEFAULT_ISSUE_TRACKER_URL \
                         --enable-languages=$ENABLE_LANGUAGES \
                         $EXTRA_CONFIG_FLAGS \
-                        $ABI_CONFIGURE_EXTRA_FLAGS
+                        $ABI_CONFIGURE_EXTRA_FLAGS \
+                        --disable-multilib
 if [ $? != 0 ] ; then
     dump "Error while trying to configure toolchain build. See $TMPLOG"
     exit 1
-- 
cgit v1.1