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
This commit is contained in:
parent
317806623e
commit
6724a1930d
@ -9,7 +9,7 @@ if [ $# \< 2 ]; then
|
|||||||
fi
|
fi
|
||||||
|
|
||||||
haikuSourceDir=$1
|
haikuSourceDir=$1
|
||||||
buildToolsDir=$2
|
buildToolsDir=$2/legacy
|
||||||
|
|
||||||
if [ $# \< 3 ]; then
|
if [ $# \< 3 ]; then
|
||||||
haikuOutputDir=$haikuSourceDir/generated
|
haikuOutputDir=$haikuSourceDir/generated
|
||||||
@ -119,9 +119,6 @@ make cross || {
|
|||||||
# install gcc
|
# install gcc
|
||||||
make install-gcc-cross || {
|
make install-gcc-cross || {
|
||||||
echo "ERROR: Installing the cross compiler failed." >&2
|
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
|
exit 1
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -47,7 +47,7 @@ cd $haikuOutputDir
|
|||||||
haikuOutputDir=$(pwd)
|
haikuOutputDir=$(pwd)
|
||||||
|
|
||||||
binutilsSourceDir=$buildToolsDir/binutils
|
binutilsSourceDir=$buildToolsDir/binutils
|
||||||
gccSourceDir=$buildToolsDir/gcc4
|
gccSourceDir=$buildToolsDir/gcc
|
||||||
|
|
||||||
|
|
||||||
# get gcc version
|
# get gcc version
|
||||||
|
Loading…
Reference in New Issue
Block a user