From owner-svn-src-projects@FreeBSD.ORG Tue Feb 26 05:44:49 2013 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by hub.freebsd.org (Postfix) with ESMTP id 566669E; Tue, 26 Feb 2013 05:44:49 +0000 (UTC) (envelope-from sjg@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id 488C8E5A; Tue, 26 Feb 2013 05:44:49 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id r1Q5inMk081831; Tue, 26 Feb 2013 05:44:49 GMT (envelope-from sjg@svn.freebsd.org) Received: (from sjg@localhost) by svn.freebsd.org (8.14.5/8.14.5/Submit) id r1Q5inF1081830; Tue, 26 Feb 2013 05:44:49 GMT (envelope-from sjg@svn.freebsd.org) Message-Id: <201302260544.r1Q5inF1081830@svn.freebsd.org> From: "Simon J. Gerraty" Date: Tue, 26 Feb 2013 05:44:49 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r247308 - projects/bmake/share/mk X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 26 Feb 2013 05:44:49 -0000 Author: sjg Date: Tue Feb 26 05:44:48 2013 New Revision: 247308 URL: http://svnweb.freebsd.org/changeset/base/247308 Log: Need .ORDER for various stage_* targets Modified: projects/bmake/share/mk/bsd.prog.mk Modified: projects/bmake/share/mk/bsd.prog.mk ============================================================================== --- projects/bmake/share/mk/bsd.prog.mk Tue Feb 26 05:44:12 2013 (r247307) +++ projects/bmake/share/mk/bsd.prog.mk Tue Feb 26 05:44:48 2013 (r247308) @@ -259,21 +259,27 @@ all: stage_files .endif .endif +.if !empty(STAGE_AS_SETS) +all: stage_as +.endif .if !empty(LINKS) all: stage_links +.ORDER: stage_files stage_links +.if !empty(STAGE_AS_SETS) +.ORDER: stage_as stage_links +.endif STAGE_SETS+= prog STAGE_LINKS.prog= ${LINKS} .endif .if !empty(SYMLINKS) all: stage_symlinks +.if !empty(STAGE_AS_SETS) +.ORDER: stage_as stage_symlinks +.endif STAGE_SETS+= prog STAGE_SYMLINKS.prog= ${SYMLINKS} .endif -.if !empty(STAGE_AS_SETS) -all: stage_as -.endif - .endif .include .endif