From 9743fe8729448b92ae8c3b0c9cca17b8c2b96d7e Mon Sep 17 00:00:00 2001
From: Ingo Weinhold <ingo_weinhold@gmx.de>
Date: Mon, 5 Dec 2005 15:01:20 +0000
Subject: [PATCH] When building the gcc 4 cross tools we now configure for
 machine i586-pc-haiku.

git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@15345 a95241bf-73f2-0310-859d-f6bbb57e9c96
---
 build/scripts/build_cross_tools_gcc4 | 10 +++++-----
 configure                            |  6 +++++-
 2 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/build/scripts/build_cross_tools_gcc4 b/build/scripts/build_cross_tools_gcc4
index b19cae2a64..5f9fd19358 100755
--- a/build/scripts/build_cross_tools_gcc4
+++ b/build/scripts/build_cross_tools_gcc4
@@ -72,13 +72,13 @@ rm -rf $installDir $objDir
 
 mkdir -p $installDir $objDir $binutilsObjDir $gccObjDir $tmpIncludeDir \
 	$tmpLibDir || exit 1
-mkdir -p $installDir/lib/gcc/i586-pc-beos/$gccVersion
+mkdir -p $installDir/lib/gcc/i586-pc-haiku/$gccVersion
 
 # build binutils
 cd $binutilsObjDir
 CFLAGS="-O2" CXXFLAGS="-O2" $binutilsSourceDir/configure \
-	--prefix=$installDir --target=i586-pc-beos --disable-nls \
-	--enable-shared=yes || exit 1
+	--prefix=$installDir --target=i586-pc-haiku --disable-nls \
+	--disable-shared || exit 1
 $make || exit 1
 $make install || exit 1
 
@@ -108,7 +108,7 @@ copy_headers $haikuSourceDir/headers/posix $tmpIncludeDir/posix
 # configure gcc
 cd $gccObjDir
 CFLAGS="-O2" CXXFLAGS="-O2" $gccSourceDir/configure --prefix=$installDir \
-	--target=i586-pc-beos --disable-nls --enable-shared=yes \
+	--target=i586-pc-haiku --disable-nls --disable-shared \
 	--enable-languages=c,c++ --with-headers=$tmpIncludeDir \
 	--with-libs=$tmpLibDir || exit 1
 
@@ -128,7 +128,7 @@ $make install || {
 
 # remove the system headers from the installation dir
 # Only the ones from the source tree should be used.
-sysIncludeDir=$installDir/i586-pc-beos/sys-include
+sysIncludeDir=$installDir/i586-pc-haiku/sys-include
 rm -rf $sysIncludeDir/be $sysIncludeDir/posix
 
 # remove the objects dir
diff --git a/configure b/configure
index 13a407fc00..976bae0d96 100755
--- a/configure
+++ b/configure
@@ -164,6 +164,9 @@ cd $currentDir
 #
 platform=`uname`
 haikuGCCVersion=
+haikuGCCMachine=i586-pc-beos
+	# TODO: Should be specifiable via parameters, when configure builds the
+	# cross tools.
 haikuStaticLibStdCxx=
 haikuSharedLibStdCxx=
 haikuStaticLibSupCxx=
@@ -202,6 +205,7 @@ while [ $# \> 0 ] ; do
 		--build-cross-tools) assertparam "$1" $#; buildCrossTools=$2; shift 2;;
 		--build-cross-tools-gcc4) assertparam "$1" $#; buildCrossTools=$2;
 						buildCrossToolsScript="${buildCrossToolsScript}_gcc4";
+						haikuGCCMachine=i586-pc-haiku;
 						shift 2;;
 		--help | -h)	usage; exit 0;;
 		*)				echo Invalid argument: \`$1\'; exit 1;;
@@ -250,7 +254,7 @@ mkdir -p $buildOutputDir || exit 1
 if [ -n "$buildCrossTools" ]; then
 	"$buildCrossToolsScript" "$sourceDir" "$buildCrossTools" \
 		$outputDir || exit 1
-	crossToolsPrefix=$outputDir/cross-tools/bin/i586-pc-beos-
+	crossToolsPrefix=$outputDir/cross-tools/bin/${haikuGCCMachine}-
 fi
 
 # cross tools