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

Moved FreeBSD setup to define a freebsd build platform. GCC4 apparently also requires the use of GNU Make, so told the build_cross_tools script to use 'gmake' instead of 'make' on BSD systems.

Browse Source 
git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@15024 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Nathan Whitehorn
2005-11-18 16:35:32 +00:00
parent 55d6d70ee5
commit 307807f2da
3 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
build/jam/BuildSetup
+3
View File
@@ -333,6 +333,7 @@ HOST_KERNEL_WARNING_C++FLAGS = -Wall ;
switch $(HOST_PLATFORM) { switch $(HOST_PLATFORM) {
case haiku : HOST_DEBUG_FLAGS ?= -ggdb ; case haiku : HOST_DEBUG_FLAGS ?= -ggdb ;
case linux : HOST_DEBUG_FLAGS ?= -ggdb ; case linux : HOST_DEBUG_FLAGS ?= -ggdb ;
case freebsd : HOST_DEBUG_FLAGS ?= -ggdb ;
case * : HOST_DEBUG_FLAGS ?= -g ; case * : HOST_DEBUG_FLAGS ?= -g ;
} }
@@ -542,6 +543,7 @@ switch $(TARGET_PLATFORM) {
case dano : TARGET_DEFINES += HAIKU_TARGET_PLATFORM_DANO ; case dano : TARGET_DEFINES += HAIKU_TARGET_PLATFORM_DANO ;
case haiku : TARGET_DEFINES += HAIKU_TARGET_PLATFORM_HAIKU ; case haiku : TARGET_DEFINES += HAIKU_TARGET_PLATFORM_HAIKU ;
case linux : TARGET_DEFINES += HAIKU_TARGET_PLATFORM_LINUX ; case linux : TARGET_DEFINES += HAIKU_TARGET_PLATFORM_LINUX ;
case freebsd : TARGET_DEFINES += HAIKU_TARGET_PLATFORM_FREEBSD ;
case libbe_test : TARGET_DEFINES += HAIKU_TARGET_PLATFORM_LIBBE_TEST ; case libbe_test : TARGET_DEFINES += HAIKU_TARGET_PLATFORM_LIBBE_TEST ;
} }
@@ -552,6 +554,7 @@ switch $(HOST_PLATFORM) {
case dano : TARGET_DEFINES += HAIKU_HOST_PLATFORM_DANO ; case dano : TARGET_DEFINES += HAIKU_HOST_PLATFORM_DANO ;
case haiku : TARGET_DEFINES += HAIKU_HOST_PLATFORM_HAIKU ; case haiku : TARGET_DEFINES += HAIKU_HOST_PLATFORM_HAIKU ;
case linux : TARGET_DEFINES += HAIKU_HOST_PLATFORM_LINUX ; case linux : TARGET_DEFINES += HAIKU_HOST_PLATFORM_LINUX ;
case freebsd : TARGET_DEFINES += HAIKU_TARGET_PLATFORM_FREEBSD ;
} }
build/scripts/build_cross_tools_gcc4
+6 -4
View File
@@ -9,6 +9,8 @@ fi
haikuSourceDir=$1 haikuSourceDir=$1
buildToolsDir=$2 buildToolsDir=$2
if [ $(uname) = "FreeBSD" ]; then make="gmake"; else make="make"; fi
if [ $# \< 3 ]; then if [ $# \< 3 ]; then
haikuOutputDir=$haikuSourceDir/generated haikuOutputDir=$haikuSourceDir/generated
else else
@@ -77,8 +79,8 @@ cd $binutilsObjDir
CFLAGS="-O2" CXXFLAGS="-O2" $binutilsSourceDir/configure \ CFLAGS="-O2" CXXFLAGS="-O2" $binutilsSourceDir/configure \
--prefix=$installDir --target=i586-pc-beos --disable-nls \ --prefix=$installDir --target=i586-pc-beos --disable-nls \
--enable-shared=yes || exit 1 --enable-shared=yes || exit 1
make || exit 1 $make || exit 1
make install || exit 1 $make install || exit 1
export PATH=$PATH:$installDir/bin export PATH=$PATH:$installDir/bin
@@ -111,13 +113,13 @@ CFLAGS="-O2" CXXFLAGS="-O2" $gccSourceDir/configure --prefix=$installDir \
--with-libs=$tmpLibDir || exit 1 --with-libs=$tmpLibDir || exit 1
# make gcc # make gcc
make || { $make || {
echo "ERROR: Building gcc failed." >&2 echo "ERROR: Building gcc failed." >&2
exit 1 exit 1
} }
# install gcc # install gcc
make install || { $make install || {
echo "ERROR: Installing the cross compiler failed." >&2 echo "ERROR: Installing the cross compiler failed." >&2
exit 1 exit 1
} }
configure
Vendored
+1 -1
View File
@@ -231,7 +231,7 @@ case "${platform}" in
esac esac
;; ;;
Linux) buildPlatform=linux ;; Linux) buildPlatform=linux ;;
FreeBSD) buildPlatform=linux ;; FreeBSD) buildPlatform=freebsd ;;
*) echo Unsupported platform: ${platform} *) echo Unsupported platform: ${platform}
exit 1 ;; exit 1 ;;
esac esac