From 6724a1930dfdfd0f764f3169410c3d46272d4685 Mon Sep 17 00:00:00 2001 From: Ingo Weinhold Date: Tue, 22 Nov 2005 23:34:51 +0000 Subject: [PATCH] Adjusted build_cross_tools[_gcc4] scripts according to the new directory layout in the buildtools module. git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@15083 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- build/scripts/build_cross_tools | 5 +---- build/scripts/build_cross_tools_gcc4 | 2 +- 2 files changed, 2 insertions(+), 5 deletions(-) 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