d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add a universe_${target}_worlds target to simplify the logic to find when

Browse Source 
to start building kernels.

Obtained from:	ABT Systems Ltd
This commit is contained in:
Andrew Turner 2015-06-16 18:43:08 +00:00
parent 35c9a2a9a1
commit 149da95c87
1 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Makefile
View File

@ -438,9 +438,12 @@ universe_epilogue: universe_${target}
universe_${target}: universe_${target}_prologue universe_${target}: universe_${target}_prologue
universe_${target}_prologue: universe_prologue universe_${target}_prologue: universe_prologue
@echo ">> ${target} started on `LC_ALL=C date`" @echo ">> ${target} started on `LC_ALL=C date`"
universe_${target}_worlds:
.if !defined(MAKE_JUST_KERNELS) .if !defined(MAKE_JUST_KERNELS)
.for target_arch in ${TARGET_ARCHES_${target}} .for target_arch in ${TARGET_ARCHES_${target}}
universe_${target}: universe_${target}_${target_arch} universe_${target}: universe_${target}_${target_arch}
universe_${target}_worlds: universe_${target}_${target_arch}
universe_${target}_${target_arch}: universe_${target}_prologue .MAKE universe_${target}_${target_arch}: universe_${target}_prologue .MAKE
@echo ">> ${target}.${target_arch} ${UNIVERSE_TARGET} started on `LC_ALL=C date`" @echo ">> ${target}.${target_arch} ${UNIVERSE_TARGET} started on `LC_ALL=C date`"
@(cd ${.CURDIR} && env __MAKE_CONF=/dev/null \ @(cd ${.CURDIR} && env __MAKE_CONF=/dev/null \
@ -456,13 +459,8 @@ universe_${target}_${target_arch}: universe_${target}_prologue .MAKE
.endif # !MAKE_JUST_KERNELS .endif # !MAKE_JUST_KERNELS
.if !defined(MAKE_JUST_WORLDS) .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}: universe_${target}_kernels
universe_${target}_kernels: universe_${target}_worlds
universe_${target}_kernels: universe_${target}_prologue .MAKE universe_${target}_kernels: universe_${target}_prologue .MAKE
.if exists(${KERNSRCDIR}/${target}/conf/NOTES) .if exists(${KERNSRCDIR}/${target}/conf/NOTES)
@(cd ${KERNSRCDIR}/${target}/conf && env __MAKE_CONF=/dev/null \ @(cd ${KERNSRCDIR}/${target}/conf && env __MAKE_CONF=/dev/null \