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

Switched the legacy compiler to the i586-pc-haiku 2.95.3-haiku-080323

Browse Source 
gcc. You need to reconfigure and rebuild the cross-tools to have this
change take effect.

Note that from now on it is no longer possible to use the native BeOS
compiler to build Haiku. You'll have to build a cross compiler, too. I
haven't tested whether this works at all, though.


git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@24542 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Ingo Weinhold
2008-03-23 23:06:23 +00:00
parent 409d26f976
commit 0da9c20813
2 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
build/scripts/build_cross_tools
+5 -5
View File
@@ -59,12 +59,12 @@ rm -rf $installDir $objDir
mkdir -p $installDir $objDir $binutilsObjDir $gccObjDir $tmpIncludeDir \ mkdir -p $installDir $objDir $binutilsObjDir $gccObjDir $tmpIncludeDir \
$tmpLibDir || exit 1 $tmpLibDir || exit 1
mkdir -p $installDir/lib/gcc-lib/i586-pc-beos/$haikuRequiredLegacyGCCVersion mkdir -p $installDir/lib/gcc-lib/i586-pc-haiku/$haikuRequiredLegacyGCCVersion
# build binutils # build binutils
cd $binutilsObjDir cd $binutilsObjDir
CFLAGS="-O2" CXXFLAGS="-O2" $buildToolsDir/binutils/configure \ CFLAGS="-O2" CXXFLAGS="-O2" $buildToolsDir/binutils/configure \
--prefix=$installDir --target=i586-pc-beos --disable-nls \ --prefix=$installDir --target=i586-pc-haiku --disable-nls \
--enable-shared=yes --disable-werror || exit 1 --enable-shared=yes --disable-werror || exit 1
make || exit 1 make || exit 1
make install || exit 1 make install || exit 1
@@ -95,7 +95,7 @@ copy_headers $haikuSourceDir/headers/posix $tmpIncludeDir/posix
# configure gcc # configure gcc
cd $gccObjDir cd $gccObjDir
CFLAGS="-O2" CXXFLAGS="-O2" $buildToolsDir/gcc/configure --prefix=$installDir \ CFLAGS="-O2" CXXFLAGS="-O2" $buildToolsDir/gcc/configure --prefix=$installDir \
--target=i586-pc-beos --disable-nls --enable-shared=yes \ --target=i586-pc-haiku --disable-nls --enable-shared=yes \
--enable-languages=c,c++ --with-headers=$tmpIncludeDir \ --enable-languages=c,c++ --with-headers=$tmpIncludeDir \
--with-libs=$tmpLibDir || exit 1 --with-libs=$tmpLibDir || exit 1
@@ -124,14 +124,14 @@ make install-gcc-cross || {
# Remove the math.h gcc header. It has been generated by fixincludes # Remove the math.h gcc header. It has been generated by fixincludes
# (unconditional hack: math_huge_val_ifndef) from ours and it is semantically # (unconditional hack: math_huge_val_ifndef) from ours and it is semantically
# equivalent. # equivalent.
rm $installDir/lib/gcc-lib/i586-pc-beos/$haikuRequiredLegacyGCCVersion/include/math.h rm $installDir/lib/gcc-lib/i586-pc-haiku/$haikuRequiredLegacyGCCVersion/include/math.h
# cleanup # cleanup
# remove the system headers from the installation dir # remove the system headers from the installation dir
# Only the ones from the source tree should be used. # Only the ones from the source tree should be used.
sysIncludeDir=$installDir/i586-pc-beos/sys-include sysIncludeDir=$installDir/i586-pc-haiku/sys-include
rm -rf $sysIncludeDir/be $sysIncludeDir/posix rm -rf $sysIncludeDir/be $sysIncludeDir/posix
# remove the objects dir # remove the objects dir
configure
Vendored
+3 -3
View File
@@ -31,7 +31,7 @@ options:
Assume cross compilation. <prefix> should be a Assume cross compilation. <prefix> should be a
path to the directory where the cross path to the directory where the cross
compilation tools are located, plus the platform compilation tools are located, plus the platform
prefix, e.g. "/path/to/tools/i586-pc-beos-". prefix, e.g. "/path/to/tools/i586-pc-haiku-".
This overrides the HAIKU_* tool variables. This overrides the HAIKU_* tool variables.
--distro-compatibility <level> --distro-compatibility <level>
The distribution's level of compatibility with The distribution's level of compatibility with
@@ -211,7 +211,7 @@ cd "$currentDir"
# #
platform=`uname` platform=`uname`
haikuGCCVersion= haikuGCCVersion=
haikuGCCMachine=i586-pc-beos haikuGCCMachine=i586-pc-haiku
haikuStaticLibStdCxx= haikuStaticLibStdCxx=
haikuSharedLibStdCxx= haikuSharedLibStdCxx=
haikuStaticLibSupCxx= haikuStaticLibSupCxx=
@@ -232,7 +232,7 @@ buildCrossTools=
buildCrossToolsScript="$sourceDir/build/scripts/build_cross_tools" buildCrossToolsScript="$sourceDir/build/scripts/build_cross_tools"
buildCrossToolsMachine= buildCrossToolsMachine=
export haikuRequiredLegacyGCCVersion="2.95.3-beos-060710" export haikuRequiredLegacyGCCVersion="2.95.3-haiku-080323"
# version of legacy gcc required to build haiku # version of legacy gcc required to build haiku
set_default_value HAIKU_AR ar set_default_value HAIKU_AR ar