From 2f63fc0d8eaa83531f33bf740c1892351c756994 Mon Sep 17 00:00:00 2001 From: bdrewery <bdrewery@FreeBSD.org> Date: Fri, 9 Sep 2016 18:49:45 +0000 Subject: [PATCH] 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 --- share/mk/bsd.subdir.mk | 5 +++-- 1 file 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