From 81eb68f28064918f4947fb410dbb23c0c21cb8bd Mon Sep 17 00:00:00 2001
From: Alex Smith <alex@alex-smith.me.uk>
Date: Wed, 4 Apr 2012 20:51:10 +0100
Subject: [PATCH] Fixed a compilation failure for the x86_64 toolchain.

This appears to be a problem with GCC's build system: it defaults to having
multilib enabled, but if it is explicitly enabled with --enable-multilib,
the build fails.

Signed-off-by: Ingo Weinhold <ingo_weinhold@gmx.de>
---
 build/scripts/build_cross_tools_gcc4 | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/build/scripts/build_cross_tools_gcc4 b/build/scripts/build_cross_tools_gcc4
index 3c4ba83491..571be11e0d 100755
--- a/build/scripts/build_cross_tools_gcc4
+++ b/build/scripts/build_cross_tools_gcc4
@@ -28,8 +28,11 @@ export MAKE
 
 case $haikuMachine in
 x86_64-*)
-	binutilsConfigureArgs="--enable-multilib"
-	gccConfigureArgs="--enable-multilib"
+	# GCC's default is to enable multilib, but there is a bug when
+	# explicitly using --enable-multilib that causes a build
+	# failure
+	binutilsConfigureArgs=""
+	gccConfigureArgs=""
 	;;
 m68k-*)
 	binutilsConfigureArgs="--enable-multilib"