diff --git a/build/scripts/build_cross_tools b/build/scripts/build_cross_tools
index e0b4cc04b4..f6067e3c52 100755
--- a/build/scripts/build_cross_tools
+++ b/build/scripts/build_cross_tools
@@ -9,7 +9,7 @@ if [ $# \< 2 ]; then
 fi
 
 haikuSourceDir=$1
-buildToolsDir=$2
+buildToolsDir=$2/legacy
 
 if [ $# \< 3 ]; then
 	haikuOutputDir=$haikuSourceDir/generated
@@ -119,9 +119,6 @@ make cross || {
 # install gcc
 make install-gcc-cross || {
 	echo "ERROR: Installing the cross compiler failed." >&2
-	echo "ERROR: Note, that it is normal for the \"make cross\" to fail" >&2
-	echo "ERROR: at some point, but it must not fail before all" >&2
-	echo "ERROR: components we need have been built." >&2
 	exit 1
 }
 
diff --git a/build/scripts/build_cross_tools_gcc4 b/build/scripts/build_cross_tools_gcc4
index c90128a53a..b19cae2a64 100755
--- a/build/scripts/build_cross_tools_gcc4
+++ b/build/scripts/build_cross_tools_gcc4
@@ -47,7 +47,7 @@ cd $haikuOutputDir
 haikuOutputDir=$(pwd)
 
 binutilsSourceDir=$buildToolsDir/binutils
-gccSourceDir=$buildToolsDir/gcc4
+gccSourceDir=$buildToolsDir/gcc
 
 
 # get gcc version