From owner-svn-src-projects@FreeBSD.ORG  Fri Mar  8 00:23:22 2013
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
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 72432D85;
 Fri,  8 Mar 2013 00:23:22 +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 4F2D6D4E;
 Fri,  8 Mar 2013 00:23:22 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.6/8.14.6) with ESMTP id r280NM2X071659;
 Fri, 8 Mar 2013 00:23:22 GMT (envelope-from sjg@svn.freebsd.org)
Received: (from sjg@localhost)
 by svn.freebsd.org (8.14.6/8.14.5/Submit) id r280NMgU071658;
 Fri, 8 Mar 2013 00:23:22 GMT (envelope-from sjg@svn.freebsd.org)
Message-Id: <201303080023.r280NMgU071658@svn.freebsd.org>
From: "Simon J. Gerraty" <sjg@FreeBSD.org>
Date: Fri, 8 Mar 2013 00:23:22 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
Subject: svn commit: r247997 - 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 &quot; projects&quot;
 tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-projects>, 
 <mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
 <mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 08 Mar 2013 00:23:22 -0000

Author: sjg
Date: Fri Mar  8 00:23:21 2013
New Revision: 247997
URL: http://svnweb.freebsd.org/changeset/base/247997

Log:
  Ensure natural order of stage_*: matches the .ORDER in meta.stage.mk

Modified:
  projects/bmake/share/mk/bsd.sys.mk

Modified: projects/bmake/share/mk/bsd.sys.mk
==============================================================================
--- projects/bmake/share/mk/bsd.sys.mk	Fri Mar  8 00:20:55 2013	(r247996)
+++ projects/bmake/share/mk/bsd.sys.mk	Fri Mar  8 00:23:21 2013	(r247997)
@@ -180,6 +180,12 @@ stage_libs: ${_LIBS}
 beforebuild: buildincludes
 .endif
 
+.for t in stage_libs stage_files stage_as
+.if target($t)
+all: $t
+.endif
+.endfor
+
 .if !empty(STAGE_AS_SETS)
 all: stage_as
 .endif
@@ -188,31 +194,18 @@ all: stage_as
 
 .if !empty(LINKS)
 all: stage_links
-.ORDER: stage_files stage_links
-.if !empty(STAGE_AS_SETS)
-.ORDER: stage_as stage_links
-.endif
 STAGE_SETS+= links
 STAGE_LINKS.links= ${LINKS}
 .endif
 
 .if !empty(SYMLINKS)
 all: stage_symlinks
-.if !empty(STAGE_AS_SETS)
-.ORDER: stage_as stage_symlinks
-.endif
 STAGE_SETS+= links
 STAGE_SYMLINKS.links= ${SYMLINKS}
 .endif
 
 .endif
 
-.for t in stage_libs stage_files stage_as
-.if target($t)
-all: $t
-.endif
-.endfor
-
 .include <meta.stage.mk>
 .endif
 .endif