Author: luigi
Date: Sun May 5 20:59:22 2013
New Revision: 250289
URL: http://svnweb.freebsd.org/changeset/base/250289
Log:
use a plain 'make toolchain' to build toolchain, and
support parallel make on this stage.
Modified:
head/release/picobsd/build/picobsd
Modified: head/release/picobsd/build/picobsd
==============================================================================
--- head/release/picobsd/build/picobsd Sun May 5 19:53:53 2013
(r250288)
+++ head/release/picobsd/build/picobsd Sun May 5 20:59:22 2013
(r250289)
@@ -175,17 +175,10 @@ create_includes_and_libraries2() { # opt
if [ -d "$1" ] ; then
cd $1 ; ${BINMAKE} ${o_par} $2 # specific target, e.g. ld-elf.so
else
- MAKEOBJDIRPREFIX=${l_objtree}
- export MAKEOBJDIRPREFIX
- # export WITH_RESCUE=yes # build crunchide
- # ${BINMAKE} ${o_par} _+_= $no toolchain _includes _libraries
- (
- # eval export `cd ${SRC}; ${BINMAKE} -f Makefile.inc1 -V BMAKEENV`
- eval "export XMAKE=\"`cd ${SRC}; make -f Makefile -V XMAKE`\""
- ${BINMAKE} ${o_par} _+_= $no toolchain
- )
+ export MAKEOBJDIRPREFIX=${l_objtree}
+ make ${o_par} $no toolchain
+ # XXX do we need any of these ?
eval export `cd ${SRC}; ${BINMAKE} -f Makefile.inc1 -V WMAKEENV`
- ${BINMAKE} ${o_par} _+_= $no _includes _libraries
[ ${o_arch} != `uname -m` ] && \
(cd ${l_objtree}; ln -s . ${o_arch}.${o_arch} || true )
fi
@@ -442,7 +435,8 @@ do_kernel() { # OK
# export CONFIG
export WARNS CWARNFLAGS
[ "${o_do_modules}" = "yes" ] && export MODULES=""
- ${BINMAKE} ${o_par} KERNCONF=${l_kernconf} \
+ # kernel build not parallelizable yet
+ ${BINMAKE} KERNCONF=${l_kernconf} \
-v -f ${PICO_TREE}/build/Makefile.conf ) || \
fail $? missing_kernel
}
_______________________________________________
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"
