Author: bdrewery
Date: Fri Sep 9 18:49:45 2016
New Revision: 305670
URL: https://svnweb.freebsd.org/changeset/base/305670
Log:
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
Modified:
head/share/mk/bsd.subdir.mk
Modified: head/share/mk/bsd.subdir.mk
==============================================================================
--- head/share/mk/bsd.subdir.mk Fri Sep 9 18:18:37 2016 (r305669)
+++ head/share/mk/bsd.subdir.mk Fri Sep 9 18:49:45 2016 (r305670)
@@ -141,12 +141,13 @@ ${__dir}: all_subdir_${DIRPRFX}${__dir}
# 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
_______________________________________________
[email protected] mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "[email protected]"
