d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

move the initialization of BINMAKE earler, so it is

Browse Source 
available throughout the entire build process.

Submitted by:	Matteo Landi
MFC after:	3 days
This commit is contained in:
Luigi Rizzo 2010-11-12 12:48:41 +00:00
parent 396a7f5025
commit 2f8d87d326
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=215177
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
release/picobsd/build/picobsd
View File

@ -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