i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

* reverted changes of revision 18985, as Ingo has pointed out, they were useless.

Browse Source 
git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@18994 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Oliver Tappe
2006-10-03 23:41:59 +00:00
parent 784166f253
commit a5b60fa88e
3 changed files with 12 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files
build/scripts/build_cross_tools
+2 -2
View File
@@ -48,8 +48,8 @@ haikuOutputDir=$(pwd)
# create the object and installation directories for the cross compilation tools # create the object and installation directories for the cross compilation tools
installDir=$haikuOutputDir/cross-tools-legacy installDir=$haikuOutputDir/cross-tools
objDir=$haikuOutputDir/cross-tools-legacyt-build objDir=$haikuOutputDir/cross-tools-build
binutilsObjDir=$objDir/binutils binutilsObjDir=$objDir/binutils
gccObjDir=$objDir/gcc gccObjDir=$objDir/gcc
tmpIncludeDir=$objDir/sysincludes tmpIncludeDir=$objDir/sysincludes
build/scripts/build_cross_tools_gcc4
+2 -2
View File
@@ -62,8 +62,8 @@ fi
# create the object and installation directories for the cross compilation tools # create the object and installation directories for the cross compilation tools
installDir=$haikuOutputDir/cross-tools-gcc4 installDir=$haikuOutputDir/cross-tools
objDir=$haikuOutputDir/cross-tools-gcc4-build objDir=$haikuOutputDir/cross-tools-build
binutilsObjDir=$objDir/binutils binutilsObjDir=$objDir/binutils
gccObjDir=$objDir/gcc gccObjDir=$objDir/gcc
tmpIncludeDir=$objDir/sysincludes tmpIncludeDir=$objDir/sysincludes
configure
Vendored
+8 -38
View File
@@ -26,25 +26,13 @@ options:
Assume cross compilation. <build tools dir> Assume cross compilation. <build tools dir>
defines the location of the build tools sources. defines the location of the build tools sources.
They will be compiled and placed in the output They will be compiled and placed in the output
directory under "cross-tools-legacy". The HAIKU_* directory under "cross-tools". The HAIKU_* tools
tools variables will be set accordingly. variables will be set accordingly.
--build-cross-tools-gcc4 <arch> <build tools dir> --build-cross-tools-gcc4 <arch> <build tools dir>
Like "--build-cross-tools" just that gcc 4 will Like "--build-cross-tools" just that gcc 4 will
be used for cross-compilation and the cross-tools be used for cross-compilation. Note, that the
will be placed in the output directory under resulting Haiku installation built with gcc 4
"cross-tools-current". Note, that the resulting will not be binary compatible with BeOS R5.
Haiku installation built with gcc 4 will not be
binary compatible with BeOS R5.
<arch> specifies the target architecture, either
"x86" or "ppc".
--use-cross-tools
Selects the cross-tools from "cross-tools-legacy"
for compilation. The HAIKU_* tools variables will
be set accordingly.
--use-cross-tools-gcc4 <arch>
Selects the cross-tools from "cross-tools-gcc4"
for compilation. The HAIKU_* tools variables will
be set accordingly.
<arch> specifies the target architecture, either <arch> specifies the target architecture, either
"x86" or "ppc". "x86" or "ppc".
--target=TARGET Select build target platform. [default=${target}] --target=TARGET Select build target platform. [default=${target}]
@@ -248,10 +236,7 @@ while [ $# -gt 0 ] ; do
--bochs-debug) bochs_debug=1; shift 1;; --bochs-debug) bochs_debug=1; shift 1;;
--target=*) target=`echo $1 | cut -d'=' -f2-`; shift 1;; --target=*) target=`echo $1 | cut -d'=' -f2-`; shift 1;;
--cross-tools-prefix) assertparam "$1" $#; crossToolsPrefix=$2; shift 2;; --cross-tools-prefix) assertparam "$1" $#; crossToolsPrefix=$2; shift 2;;
--build-cross-tools) assertparam "$1" $#; buildCrossTools=$2; --build-cross-tools) assertparam "$1" $#; buildCrossTools=$2; shift 2;;
crossToolsFolder="cross-tools-legacy";
shift 2;;
--use-cross-tools) crossToolsFolder="cross-tools-legacy"; shift 1;;
--build-cross-tools-gcc4) assertparams "$1" 2 $#; buildCrossTools=$3; --build-cross-tools-gcc4) assertparams "$1" 2 $#; buildCrossTools=$3;
buildCrossToolsScript="${buildCrossToolsScript}_gcc4"; buildCrossToolsScript="${buildCrossToolsScript}_gcc4";
case "$2" in case "$2" in
@@ -260,19 +245,8 @@ while [ $# -gt 0 ] ; do
*) echo "Unsupported target architecture: $2" *) echo "Unsupported target architecture: $2"
exit 1;; exit 1;;
esac esac
buildCrossToolsMachine=$haikuGCCMachine; buildCrossToolsMachine=$haikuGCCMachine
crossToolsFolder="cross-tools-gcc4";
shift 3;; shift 3;;
--use-cross-tools-gcc4) assertparam "$1" $#;
case "$2" in
x86) haikuGCCMachine=i586-pc-haiku;;
ppc) haikuGCCMachine=powerpc-apple-haiku;;
*) echo "Unsupported target architecture: $2"
exit 1;;
esac
buildCrossToolsMachine=$haikuGCCMachine;
crossToolsFolder="cross-tools-gcc4";
shift 2;;
--help | -h) usage; exit 0;; --help | -h) usage; exit 0;;
*) echo Invalid argument: \`$1\'; exit 1;; *) echo Invalid argument: \`$1\'; exit 1;;
esac esac
@@ -321,11 +295,7 @@ mkdir -p "$buildOutputDir" || exit 1
if [ -n "$buildCrossTools" ]; then if [ -n "$buildCrossTools" ]; then
"$buildCrossToolsScript" $buildCrossToolsMachine "$sourceDir" \ "$buildCrossToolsScript" $buildCrossToolsMachine "$sourceDir" \
"$buildCrossTools" "$outputDir" || exit 1 "$buildCrossTools" "$outputDir" || exit 1
fi crossToolsPrefix="$outputDir/cross-tools/bin/${haikuGCCMachine}-"
# use specified cross tools
if [ -n "$crossToolsFolder" ]; then
crossToolsPrefix="$outputDir/$crossToolsFolder/bin/${haikuGCCMachine}-"
fi fi
# cross tools # cross tools