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.
This commit is contained in:
@@ -130,11 +130,18 @@ copy_headers $haikuSourceDir/headers/posix $tmpIncludeDir/posix
|
|||||||
|
|
||||||
# configure gcc
|
# configure gcc
|
||||||
cd $gccObjDir
|
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 \
|
CFLAGS="-O2 -U_FORTIFY_SOURCE" CXXFLAGS="-O2" $buildToolsDir/gcc/configure \
|
||||||
--prefix=$installDir \
|
--prefix=$installDir \
|
||||||
--target=i586-pc-haiku --disable-nls --enable-shared=yes \
|
--target=i586-pc-haiku --disable-nls --enable-shared=yes \
|
||||||
--enable-languages=c,c++ --with-headers=$tmpIncludeDir \
|
--enable-languages=c,c++ --with-headers=$tmpIncludeDir \
|
||||||
--with-libs=$tmpLibDir || exit 1
|
--with-libs=$tmpLibDir || exit 1
|
||||||
|
unset CC
|
||||||
|
|
||||||
# hack the Makefile to avoid trouble with stuff we don't need anyway
|
# hack the Makefile to avoid trouble with stuff we don't need anyway
|
||||||
sedExpr=
|
sedExpr=
|
||||||
|
|||||||
Reference in New Issue
Block a user