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
_______________________________________________
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
