From 9e0ab53d2eabc0b0aeed7f413dc8180537d0d421 Mon Sep 17 00:00:00 2001
From: luigi <luigi@FreeBSD.org>
Date: Sun, 5 May 2013 20:59:22 +0000
Subject: use a plain 'make toolchain' to build toolchain, and support parallel
 make on this stage.

---
 release/picobsd/build/picobsd | 16 +++++-----------
 1 file changed, 5 insertions(+), 11 deletions(-)

(limited to 'release/picobsd')

diff --git a/release/picobsd/build/picobsd b/release/picobsd/build/picobsd
index dd058c2..095a6ef 100755
--- a/release/picobsd/build/picobsd
+++ b/release/picobsd/build/picobsd
@@ -175,17 +175,10 @@ create_includes_and_libraries2() { # opt_dir opt_target
     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
 }
-- 
cgit v1.1