From 20a2600f84554023f0954887c9cfc8bf63c28cf0 Mon Sep 17 00:00:00 2001
From: luigi <luigi@FreeBSD.org>
Date: Fri, 12 Nov 2010 12:48:41 +0000
Subject: move the initialization of BINMAKE earler, so it is available
 throughout the entire build process.

Submitted by:	Matteo Landi
MFC after:	3 days
---
 release/picobsd/build/picobsd | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

(limited to 'release/picobsd/build')

diff --git a/release/picobsd/build/picobsd b/release/picobsd/build/picobsd
index b798389..7948b5b 100755
--- a/release/picobsd/build/picobsd
+++ b/release/picobsd/build/picobsd
@@ -297,11 +297,6 @@ build_image() {
     PICO_OBJ=${l_objtree}/picobsd/${THETYPE}
     log "PICO_OBJ is ${PICO_OBJ}"
 
-    if [ ${OSVERSION} -ge 500035 ] ; then
-	export MAKEOBJDIRPREFIX=${l_objtree}
-	eval "export BINMAKE=\"`cd ${SRC}; make -f Makefile -V BINMAKE`\""
-	eval export `cd ${SRC}; ${BINMAKE} -f Makefile.inc1 -V WMAKEENV`
-    fi
     # create build directory and subtree
     mkdir -p ${BUILDDIR}/crunch
     # remove any old stuff
@@ -979,10 +974,17 @@ set_build_parameters() {
 	l_usrtree=${USR:-${SRC}/../usr}
     fi
     l_objtree=${l_usrtree}/obj-pico
+
     PICO_TREE=${PICO_TREE:-${SRC}/release/picobsd}
     set `grep "#define[\t ]__FreeBSD_version" ${SRC}/sys/sys/param.h`
     OSVERSION=$3
     log "OSVERSION is ${OSVERSION}"
+    if [ ${OSVERSION} -ge 500035 ] ; then
+	export MAKEOBJDIRPREFIX=${l_objtree}
+	eval "export BINMAKE=\"`cd ${SRC}; make -f Makefile -V BINMAKE`\""
+	eval export `cd ${SRC}; ${BINMAKE} -f Makefile.inc1 -V WMAKEENV`
+    fi
+
     if [ "${o_init_src}" != "" ] ; then
 	if [ ${OSVERSION} -lt 500035 ] ; then
 	    create_includes_and_libraries
-- 
cgit v1.1