diff options
| author | Bryan Drewery <bdrewery@FreeBSD.org> | 2016-09-09 18:49:45 +0000 |
|---|---|---|
| committer | Bryan Drewery <bdrewery@FreeBSD.org> | 2016-09-09 18:49:45 +0000 |
| commit | 61018287f744244f784a0096f7e106120c0eb76e (patch) | |
| tree | 2285b706e97cc8d211e5ff3ba2975df2862761ed /share | |
| parent | 82b3cec52b4b2f7ee3088921422aac759bf0604f (diff) | |
| download | src-61018287f744244f784a0096f7e106120c0eb76e.tar.gz src-61018287f744244f784a0096f7e106120c0eb76e.zip | |
Fix regression from r304644 which could cause .WAITs in SUBDIR to be ignored.
This was possible if a STANDALONE_SUBDIR_TARGET item came in
SUBDIR_TARGETS before 'all', which would then cause SUBDIR to
have all .WAIT's removed.
Sponsored by: Dell EMC Isilon
Notes
Notes:
svn path=/head/; revision=305670
Diffstat (limited to 'share')
| -rw-r--r-- | share/mk/bsd.subdir.mk | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/share/mk/bsd.subdir.mk b/share/mk/bsd.subdir.mk index 786eef1eba9c..34fc8325ae3f 100644 --- a/share/mk/bsd.subdir.mk +++ b/share/mk/bsd.subdir.mk @@ -141,12 +141,13 @@ ${__dir}: all_subdir_${DIRPRFX}${__dir} .PHONY # Can ordering be skipped for this and SUBDIR_PARALLEL forced? .if ${STANDALONE_SUBDIR_TARGETS:M${__target}} _is_standalone_target= 1 -SUBDIR:= ${SUBDIR:N.WAIT} +_subdir_filter= N.WAIT .else _is_standalone_target= 0 +_subdir_filter= .endif __subdir_targets= -.for __dir in ${SUBDIR} +.for __dir in ${SUBDIR:${_subdir_filter}} .if ${__dir} == .WAIT __subdir_targets+= .WAIT .else |