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

For SUBDIR_PARALLEL, when doing 'make clean*' or 'make obj' there is no need to

Browse Source 
respect SUBDIR_DEPEND_* or .WAIT.

MFC after:	2 weeks
Sponsored by:	EMC / Isilon Storage Division
This commit is contained in:
bdrewery 2015-10-22 23:41:56 +00:00
parent 3011618906
commit 7761ab52bc
1 changed files with 11 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
share/mk/bsd.subdir.mk
View File

@ -83,6 +83,15 @@ ${SUBDIR:N.WAIT}: .PHONY .MAKE
dir=${.TARGET}; \ dir=${.TARGET}; \
${_SUBDIR_SH}; ${_SUBDIR_SH};
# .WAIT and dependencies can be skipped for some targets.
.if defined(SUBDIR_PARALLEL)
.if make(obj) || make(clean*)
_skip_subdir_ordering= 1
SUBDIR:= ${SUBDIR:N.WAIT}
.else
_skip_subdir_ordering= 0
.endif
.endif # defined(SUBDIR_PARALLEL)
# Work around parsing of .if nested in .for by putting .WAIT string into a var. # Work around parsing of .if nested in .for by putting .WAIT string into a var.
__wait= .WAIT __wait= .WAIT
.for __target in ${ALL_SUBDIR_TARGETS} .for __target in ${ALL_SUBDIR_TARGETS}
@ -94,9 +103,11 @@ __subdir_targets+= .WAIT
.else .else
__subdir_targets+= ${__target}_subdir_${__dir} __subdir_targets+= ${__target}_subdir_${__dir}
__deps= __deps=
.if ${_skip_subdir_ordering} == 0
.for __dep in ${SUBDIR_DEPEND_${__dir}} .for __dep in ${SUBDIR_DEPEND_${__dir}}
__deps+= ${__target}_subdir_${__dep} __deps+= ${__target}_subdir_${__dep}
.endfor .endfor
.endif
${__target}_subdir_${__dir}: .PHONY .MAKE ${__deps} ${__target}_subdir_${__dir}: .PHONY .MAKE ${__deps}
.if !defined(NO_SUBDIR) .if !defined(NO_SUBDIR)
@${_+_}target=${__target:realinstall=install}; \ @${_+_}target=${__target:realinstall=install}; \