* Added build_cross_tools_gcc4 script which builds gcc 4 and binutils
from the sources. Added respective configure option --build-cross-tools-gcc4. * Fixed running "configure --build-cross-tools" from another directory than the source dir. The parameter to the script was missing and thus the tools were created in <sources>/generated. * Removed stdc++ lib header dir ".../debug". One is supposed to include <debug/...> to get the debug headers. * The stdc++ lib header dirs are now listed one per line in the generated BuildConfig. This works around the 512 bytes jam line length limit. git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@15020 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
@@ -28,6 +28,11 @@ options:
|
||||
They will be compiled and placed in the output
|
||||
directory under "cross-tools". The HAIKU_* tools
|
||||
variables will be set accordingly.
|
||||
--build-cross-tools-gcc4 <build tools dir>
|
||||
Like "--build-cross-tools" just that gcc 4 will
|
||||
be used for cross-compilation. Note, that the
|
||||
resulting Haiku installation built with gcc 4
|
||||
will not be binary compatible with BeOS R5.
|
||||
--target=TARGET Select build target platform. [default=${target}]
|
||||
valid targets=r5,bone,dano,haiku
|
||||
--include-gpl-addons Include GPL licensed add-ons.
|
||||
@@ -89,8 +94,11 @@ standard_gcc_settings()
|
||||
haikuSharedLibSupCxx=`$HAIKU_CC -print-file-name=libsupc++.so`
|
||||
local headers=$gccdir/../../../../include/c++/$haikuGCCVersion
|
||||
haikuCxxHeadersDir=$headers
|
||||
for d in $haikuGCCMachine backward ext debug; do
|
||||
haikuCxxHeadersDir="$haikuCxxHeadersDir $headers/$d"
|
||||
for d in $haikuGCCMachine backward ext; do
|
||||
# Note: We need the line break, otherwise the line might become
|
||||
# too long for jam (512 bytes max).
|
||||
haikuCxxHeadersDir="$haikuCxxHeadersDir
|
||||
$headers/$d"
|
||||
done
|
||||
|
||||
if [ $haikuStaticLibStdCxx = libstdc++.a ]; then
|
||||
@@ -168,6 +176,7 @@ include_gpl_addons=0
|
||||
target=haiku
|
||||
crossToolsPrefix=
|
||||
buildCrossTools=
|
||||
buildCrossToolsScript="$sourceDir/build/scripts/build_cross_tools"
|
||||
|
||||
set_default_value HAIKU_AR ar
|
||||
set_default_value HAIKU_CC gcc
|
||||
@@ -191,6 +200,9 @@ while [ $# \> 0 ] ; do
|
||||
--target=*) target=`echo $1 | cut -d'=' -f2-`; shift 1;;
|
||||
--cross-tools-prefix) assertparam "$1" $#; crossToolsPrefix=$2; shift 2;;
|
||||
--build-cross-tools) assertparam "$1" $#; buildCrossTools=$2; shift 2;;
|
||||
--build-cross-tools-gcc4) assertparam "$1" $#; buildCrossTools=$2;
|
||||
buildCrossToolsScript="${buildCrossToolsScript}_gcc4";
|
||||
shift 2;;
|
||||
--help | -h) usage; exit 0;;
|
||||
*) echo Invalid argument: \`$1\'; exit 1;;
|
||||
esac
|
||||
@@ -236,8 +248,8 @@ mkdir -p $buildOutputDir || exit 1
|
||||
|
||||
# build cross tools from sources
|
||||
if [ -n "$buildCrossTools" ]; then
|
||||
"$sourceDir/build/scripts/build_cross_tools" "$sourceDir" \
|
||||
"$buildCrossTools" || exit 1
|
||||
"$buildCrossToolsScript" "$sourceDir" "$buildCrossTools" \
|
||||
$outputDir || exit 1
|
||||
crossToolsPrefix=$outputDir/cross-tools/bin/i586-pc-beos-
|
||||
fi
|
||||
|
||||
|
||||
Reference in New Issue
Block a user