From owner-svn-src-head@FreeBSD.ORG  Fri Nov 12 12:48:42 2010
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 56C9D106566B;
	Fri, 12 Nov 2010 12:48:42 +0000 (UTC)
	(envelope-from luigi@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 43E7C8FC12;
	Fri, 12 Nov 2010 12:48:42 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id oACCmg3A008867;
	Fri, 12 Nov 2010 12:48:42 GMT (envelope-from luigi@svn.freebsd.org)
Received: (from luigi@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id oACCmgUD008865;
	Fri, 12 Nov 2010 12:48:42 GMT (envelope-from luigi@svn.freebsd.org)
Message-Id: <201011121248.oACCmgUD008865@svn.freebsd.org>
From: Luigi Rizzo <luigi@FreeBSD.org>
Date: Fri, 12 Nov 2010 12:48:42 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r215177 - head/release/picobsd/build
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
	<svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 12 Nov 2010 12:48:42 -0000

Author: luigi
Date: Fri Nov 12 12:48:41 2010
New Revision: 215177
URL: http://svn.freebsd.org/changeset/base/215177

Log:
  move the initialization of BINMAKE earler, so it is
  available throughout the entire build process.
  
  Submitted by:	Matteo Landi
  MFC after:	3 days

Modified:
  head/release/picobsd/build/picobsd

Modified: head/release/picobsd/build/picobsd
==============================================================================
--- head/release/picobsd/build/picobsd	Fri Nov 12 12:07:36 2010	(r215176)
+++ head/release/picobsd/build/picobsd	Fri Nov 12 12:48:41 2010	(r215177)
@@ -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