svn commit: r247997 - projects/bmake/share/mk

[Simon J. Gerraty]

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