added 1 changeset to branch 'refs/remotes/HaikuPM-github/package-management' old head: 5657c5eaa59832bf1fa4f1e08e9ed59796ce018f new head: 86de8c37b5bc2266be9f61eb8cb07c932c11625d overview: https://github.com/haiku/HaikuPM/compare/5657c5e...86de8c3 ---------------------------------------------------------------------------- 86de8c3: Use GNU make also for building gcc 2 Should fix the build on {Free,Open}BSD. [ Ingo Weinhold <ingo_weinhold@xxxxxx> ] ---------------------------------------------------------------------------- Commit: 86de8c37b5bc2266be9f61eb8cb07c932c11625d Author: Ingo Weinhold <ingo_weinhold@xxxxxx> Date: Thu Aug 22 10:31:48 2013 UTC ---------------------------------------------------------------------------- 3 files changed, 11 insertions(+), 14 deletions(-) build/scripts/build_cross_tools | 8 ++++---- build/scripts/build_cross_tools_gcc4 | 10 ---------- configure | 7 +++++++ ---------------------------------------------------------------------------- diff --git a/build/scripts/build_cross_tools b/build/scripts/build_cross_tools index 6347a2a..18f52a7 100755 --- a/build/scripts/build_cross_tools +++ b/build/scripts/build_cross_tools @@ -113,8 +113,8 @@ cd $binutilsObjDir CFLAGS="-O2" CXXFLAGS="-O2" $buildToolsDir/binutils/configure \ --prefix=$installDir $buildHostSpec --target=i586-pc-haiku \ --disable-nls --enable-shared=yes --disable-werror || exit 1 -make $additionalMakeArgs || exit 1 -make $additionalMakeArgs install || exit 1 +$MAKE $additionalMakeArgs || exit 1 +$MAKE $additionalMakeArgs install || exit 1 PATH=$PATH:$installDir/bin export PATH @@ -173,13 +173,13 @@ eval "sed $sedExpr Makefile.bak > Makefile" || exit 1 rm Makefile.bak # make gcc -make cross || { +$MAKE cross || { echo "ERROR: Building gcc failed." >&2 exit 1 } # install gcc -make install-gcc-cross || { +$MAKE install-gcc-cross || { echo "ERROR: Installing the cross compiler failed." >&2 exit 1 } diff --git a/build/scripts/build_cross_tools_gcc4 b/build/scripts/build_cross_tools_gcc4 index 1b2e70c..6004431 100755 --- a/build/scripts/build_cross_tools_gcc4 +++ b/build/scripts/build_cross_tools_gcc4 @@ -16,16 +16,6 @@ installDir=$4 shift 4 additionalMakeArgs=$* -case `uname` in -FreeBSD|OpenBSD) - MAKE=gmake - ;; -*) - MAKE=make - ;; -esac -export MAKE - case $haikuMachine in x86_64-*) # GCC's default is to enable multilib, but there is a bug when diff --git a/configure b/configure index f46a3fe..48d8df7 100755 --- a/configure +++ b/configure @@ -754,6 +754,13 @@ else if [ -z "$isPrimaryArch" ]; then secondaryArch=$targetArch fi + + case $HOST_PLATFORM in + freebsd|openbsd) MAKE=gmake;; + *) MAKE=make;; + esac + + MAKE=$MAKE \ SECONDARY_ARCH=$secondaryArch \ HAIKU_USE_GCC_GRAPHITE=`get_variable \ HAIKU_USE_GCC_GRAPHITE_$targetArch` \