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

KekenoBSD/src

Fork 0

Browse Source

This commit is contained in:

Simon J. Gerraty

2013-03-08 00:23:21 +00:00

parent 55f2e9ab1c

commit 92054a537e

1 changed files with 6 additions and 13 deletions

									
										share/mk/bsd.sys.mk
									
		+6
		-13
	
												View File
												
				@@ -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