From owner-svn-src-all@freebsd.org Fri Sep 9 18:49:46 2016 Return-Path: Delivered-To: svn-src-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id A8276BD49E6; Fri, 9 Sep 2016 18:49:46 +0000 (UTC) (envelope-from bdrewery@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 7809D308; Fri, 9 Sep 2016 18:49:46 +0000 (UTC) (envelope-from bdrewery@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u89InjWx015606; Fri, 9 Sep 2016 18:49:45 GMT (envelope-from bdrewery@FreeBSD.org) Received: (from bdrewery@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u89Injol015605; Fri, 9 Sep 2016 18:49:45 GMT (envelope-from bdrewery@FreeBSD.org) Message-Id: <201609091849.u89Injol015605@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: bdrewery set sender to bdrewery@FreeBSD.org using -f From: Bryan Drewery Date: Fri, 9 Sep 2016 18:49:45 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r305670 - head/share/mk X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 09 Sep 2016 18:49:46 -0000 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