diff options
| author | luigi <luigi@FreeBSD.org> | 2011-02-05 23:03:40 +0000 |
|---|---|---|
| committer | luigi <luigi@FreeBSD.org> | 2011-02-05 23:03:40 +0000 |
| commit | 03ef5e5e31dae64276ae9a5b262c2a8958aaa86f (patch) | |
| tree | 6d403ce7fc53a6eb3b1bc79ccd5945ddd3cadcdc /release/picobsd/build/picobsd | |
| parent | 3cc91012bda1e2ff3b97420def74ffcf80368564 (diff) | |
| download | FreeBSD-src-03ef5e5e31dae64276ae9a5b262c2a8958aaa86f.zip FreeBSD-src-03ef5e5e31dae64276ae9a5b262c2a8958aaa86f.tar.gz | |
following the recent (218130) changes to Makefile and Makefile.inc1,
we need to set TARGET and TARGET_ARCH to get a correct WMAKEENV.
I am setting both to i386 since this is what picobsd is used for,
though there might be a better fix.
Add initial support for parallel make. This is disabled right now,
because there are incorrect dependencies somewhere which require
to run picobsd 2-3 times to complete a build.
MFC after: 2 weeks
Diffstat (limited to 'release/picobsd/build/picobsd')
| -rwxr-xr-x | release/picobsd/build/picobsd | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/release/picobsd/build/picobsd b/release/picobsd/build/picobsd index 7948b5b..eacefc4 100755 --- a/release/picobsd/build/picobsd +++ b/release/picobsd/build/picobsd @@ -176,9 +176,9 @@ create_includes_and_libraries2() { # opt_dir opt_target ( cd ${SRC}; # make -DNOCLEAN -DNOPROFILE -DNOGAMES -DNOLIBC_R -DPICOBSD buildworld if [ -d "$1" ] ; then - cd $1 ; ${BINMAKE} $2 # specific target, e.g. ld-elf.so + cd $1 ; ${BINMAKE} ${o_par} $2 # specific target, e.g. ld-elf.so else - ${BINMAKE} _+_= $no toolchain _includes _libraries + ${BINMAKE} ${o_par} _+_= $no toolchain _includes _libraries fi ) } @@ -452,7 +452,7 @@ do_kernel() { # OK (cd $MY_TREE; export name SRC BUILDDIR # used in this makefile ; # export CONFIG [ "${o_do_modules}" = "yes" ] && export MODULES="" - ${BINMAKE} -v -f ${PICO_TREE}/build/Makefile.conf ) || \ + ${BINMAKE} ${o_par} -v -f ${PICO_TREE}/build/Makefile.conf ) || \ fail $? missing_kernel } @@ -981,6 +981,7 @@ set_build_parameters() { log "OSVERSION is ${OSVERSION}" if [ ${OSVERSION} -ge 500035 ] ; then export MAKEOBJDIRPREFIX=${l_objtree} + export TARGET_ARCH=i386 TARGET=i386 eval "export BINMAKE=\"`cd ${SRC}; make -f Makefile -V BINMAKE`\"" eval export `cd ${SRC}; ${BINMAKE} -f Makefile.inc1 -V WMAKEENV` fi @@ -1020,6 +1021,8 @@ set_build_parameters() { # Main entry of the script. Initialize variables, parse command line # arguments. +# o_par="-j 8" # parallel make and other make options + set_defaults while [ true ]; do log "Parsing $1" |
