diff options
| author | bapt <bapt@FreeBSD.org> | 2015-06-16 20:01:01 +0000 |
|---|---|---|
| committer | bapt <bapt@FreeBSD.org> | 2015-06-16 20:01:01 +0000 |
| commit | 686222ed2646486339558a04b374363546a91051 (patch) | |
| tree | 7d78ffcbe0e354deb080c13e3b3d7b197bdeb90e /Makefile | |
| parent | 2290a2e7300b3f2f2bb0826bb85568ccdff8ba35 (diff) | |
| parent | 49fddee16cf34fece7084c6a6ad9eeaab154daa5 (diff) | |
| download | FreeBSD-src-686222ed2646486339558a04b374363546a91051.zip FreeBSD-src-686222ed2646486339558a04b374363546a91051.tar.gz | |
Merge from head@274131
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 28 |
1 files changed, 19 insertions, 9 deletions
@@ -99,7 +99,10 @@ # # For more information, see the build(7) manual page. # -.if ${MK_META_MODE:Uno} == "yes" + +# Note: we use this awkward construct to be compatible with FreeBSD's +# old make used in 10.0 and 9.2 and earlier. +.if defined(MK_META_MODE) && ${MK_META_MODE} == "yes" # targets/Makefile plays the role of top-level .include "targets/Makefile" .else @@ -436,9 +439,13 @@ universe_epilogue: universe_${target} universe_${target}: universe_${target}_prologue universe_${target}_prologue: universe_prologue @echo ">> ${target} started on `LC_ALL=C date`" +universe_${target}_worlds: + .if !defined(MAKE_JUST_KERNELS) .for target_arch in ${TARGET_ARCHES_${target}} universe_${target}: universe_${target}_${target_arch} +universe_${target}_worlds: universe_${target}_${target_arch} +universe_${target}_done: universe_${target}_worlds universe_${target}_${target_arch}: universe_${target}_prologue .MAKE @echo ">> ${target}.${target_arch} ${UNIVERSE_TARGET} started on `LC_ALL=C date`" @(cd ${.CURDIR} && env __MAKE_CONF=/dev/null \ @@ -451,15 +458,12 @@ universe_${target}_${target_arch}: universe_${target}_prologue .MAKE ${MAKEFAIL})) @echo ">> ${target}.${target_arch} ${UNIVERSE_TARGET} completed on `LC_ALL=C date`" .endfor -.endif +.endif # !MAKE_JUST_KERNELS + .if !defined(MAKE_JUST_WORLDS) -# If we are building world and kernels wait for the required worlds to finish -.if !defined(MAKE_JUST_KERNELS) -.for target_arch in ${TARGET_ARCHES_${target}} -universe_${target}_kernels: universe_${target}_${target_arch} -.endfor -.endif universe_${target}: universe_${target}_kernels +universe_${target}_done: universe_${target}_kernels +universe_${target}_kernels: universe_${target}_worlds universe_${target}_kernels: universe_${target}_prologue .MAKE .if exists(${KERNSRCDIR}/${target}/conf/NOTES) @(cd ${KERNSRCDIR}/${target}/conf && env __MAKE_CONF=/dev/null \ @@ -469,7 +473,11 @@ universe_${target}_kernels: universe_${target}_prologue .MAKE .endif @cd ${.CURDIR} && ${SUB_MAKE} ${.MAKEFLAGS} TARGET=${target} \ universe_kernels -.endif +.endif # !MAKE_JUST_WORLDS + +# Tell the user the worlds and kernels have completed +universe_${target}: universe_${target}_done +universe_${target}_done: @echo ">> ${target} completed on `LC_ALL=C date`" .endfor universe_kernels: universe_kernconfs @@ -522,6 +530,7 @@ universe_epilogue: buildLINT: ${MAKE} -C ${.CURDIR}/sys/${_TARGET}/conf LINT +.if defined(.PARSEDIR) # This makefile does not run in meta mode .MAKE.MODE= normal # Normally the things we run from here don't either. @@ -539,5 +548,6 @@ UPDATE_DEPENDFILE= NO MAKE_JOB_ERROR_TOKEN= no .export MAKE_JOB_ERROR_TOKEN .endif +.endif # bmake .endif # META_MODE |
