Don't know why multilib was disabled in r29035, but we'll likely need it for arm, and m68k as well...

Make it depend on haikuMachine.


git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@32213 a95241bf-73f2-0310-859d-f6bbb57e9c96

build/scripts/build_cross_tools_gcc4

@@ -22,6 +22,21 @@ FreeBSD|OpenBSD)
 esac
 export MAKE
 
+case $haikuMachine in
+m68k-*)
+	binutilsConfigureArgs="--enable-multilib"
+	gccConfigureArgs="--enable-multilib"
+	;;
+arm-*)
+	binutilsConfigureArgs="--enable-multilib"
+	gccConfigureArgs="--enable-multilib"
+	;;
+*)
+	binutilsConfigureArgs="--disable-multilib"
+	gccConfigureArgs="--disable-multilib"
+	;;
+esac
+
 if [ $# -lt 4 ]; then
 	haikuOutputDir=$haikuSourceDir/generated
 else
@@ -89,7 +104,7 @@ mkdir -p $installDir/lib/gcc/$haikuMachine/$gccVersion
 cd $binutilsObjDir
 CFLAGS="-O2" CXXFLAGS="-O2" $binutilsSourceDir/configure \
 	--prefix=$installDir --target=$haikuMachine --disable-nls \
-	--disable-shared --disable-multilib --disable-werror || exit 1
+	--disable-shared --disable-werror $binutilsConfigureArgs || exit 1
 $MAKE || exit 1
 $MAKE install || exit 1
 
@@ -120,8 +135,9 @@ copy_headers $haikuSourceDir/headers/posix $tmpIncludeDir/posix
 cd $gccObjDir
 CFLAGS="-O2" CXXFLAGS="-O2" $gccSourceDir/configure --prefix=$installDir \
 	--target=$haikuMachine --disable-nls --disable-shared \
-	--disable-multilib --enable-languages=c,c++ \
+	--enable-languages=c,c++ \
-	--with-headers=$tmpIncludeDir --with-libs=$tmpLibDir || exit 1
+	--with-headers=$tmpIncludeDir --with-libs=$tmpLibDir \
+	$gccConfigureArgs || exit 1
 
 # make gcc
 $MAKE || {