use a plain 'make toolchain' to build toolchain, and

support parallel make on this stage.
This commit is contained in:
luigi 2013-05-05 20:59:22 +00:00
parent ddd0f9d4a3
commit 9e0ab53d2e

View File

@ -175,17 +175,10 @@ create_includes_and_libraries2() { # opt_dir opt_target
if [ -d "$1" ] ; then if [ -d "$1" ] ; then
cd $1 ; ${BINMAKE} ${o_par} $2 # specific target, e.g. ld-elf.so cd $1 ; ${BINMAKE} ${o_par} $2 # specific target, e.g. ld-elf.so
else else
MAKEOBJDIRPREFIX=${l_objtree} export MAKEOBJDIRPREFIX=${l_objtree}
export MAKEOBJDIRPREFIX make ${o_par} $no toolchain
# export WITH_RESCUE=yes # build crunchide # XXX do we need any of these ?
# ${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
)
eval export `cd ${SRC}; ${BINMAKE} -f Makefile.inc1 -V WMAKEENV` eval export `cd ${SRC}; ${BINMAKE} -f Makefile.inc1 -V WMAKEENV`
${BINMAKE} ${o_par} _+_= $no _includes _libraries
[ ${o_arch} != `uname -m` ] && \ [ ${o_arch} != `uname -m` ] && \
(cd ${l_objtree}; ln -s . ${o_arch}.${o_arch} || true ) (cd ${l_objtree}; ln -s . ${o_arch}.${o_arch} || true )
fi fi
@ -442,7 +435,8 @@ do_kernel() { # OK
# export CONFIG # export CONFIG
export WARNS CWARNFLAGS export WARNS CWARNFLAGS
[ "${o_do_modules}" = "yes" ] && export MODULES="" [ "${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 ) || \ -v -f ${PICO_TREE}/build/Makefile.conf ) || \
fail $? missing_kernel fail $? missing_kernel
} }