From e715eca04c1f99684b5972dd7db4514b56e37b60 Mon Sep 17 00:00:00 2001
From: Alex Smith <alex@alex-smith.me.uk>
Date: Sun, 29 Jul 2012 21:03:14 +0100
Subject: [PATCH] Worked around broken GCC 2 on OS X hosts.

GCC 2 built for OS X 10.7/10.8 was broken, the Haiku build would fail
with some strange errors. Forcing compilation of GCC 2 in 32-bit mode
results in a working GCC.
---
 build/scripts/build_cross_tools | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/build/scripts/build_cross_tools b/build/scripts/build_cross_tools
index 3f773a7383..ea442b5557 100755
--- a/build/scripts/build_cross_tools
+++ b/build/scripts/build_cross_tools
@@ -130,11 +130,18 @@ copy_headers $haikuSourceDir/headers/posix $tmpIncludeDir/posix
 
 # configure gcc
 cd $gccObjDir
+case `uname` in
+	Darwin)
+		# GCC 2 compiled for x86_64 OS X is broken, compile for i386.
+		export CC="gcc -arch i386"
+	;;
+esac
 CFLAGS="-O2 -U_FORTIFY_SOURCE" CXXFLAGS="-O2" $buildToolsDir/gcc/configure \
 	--prefix=$installDir \
 	--target=i586-pc-haiku --disable-nls --enable-shared=yes \
 	--enable-languages=c,c++ --with-headers=$tmpIncludeDir \
 	--with-libs=$tmpLibDir || exit 1
+unset CC
 
 # hack the Makefile to avoid trouble with stuff we don't need anyway
 sedExpr=