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

[Simon J. Gerraty]

Author: sjg
Date: Thu Nov  8 21:36:19 2012
New Revision: 242798
URL: http://svnweb.freebsd.org/changeset/base/242798

Log:
  Use prebuild and a barrier, to allow ensuring headers are
  staged before we attempt to build anything.

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

Modified: projects/bmake/share/mk/bsd.lib.mk
==============================================================================
--- projects/bmake/share/mk/bsd.lib.mk	Thu Nov  8 21:35:20 2012	(r242797)
+++ projects/bmake/share/mk/bsd.lib.mk	Thu Nov  8 21:36:19 2012	(r242798)
@@ -114,7 +114,12 @@ PO_FLAG=-pg
 	${CTFCONVERT_CMD}
 
 .if !defined(_SKIP_BUILD)
-all: objwarn
+all: prebuild .WAIT
+prebuild: objwarn
+.if !defined(.PARSEDIR)
+# this is a no-op
+.WAIT:
+.endif
 .endif
 
 .include <bsd.symver.mk>
@@ -408,10 +413,13 @@ clean:
 .if defined(_SKIP_BUILD)
 stage_libs stage_files stage_as:
 .else
-.if !empty(_LIBS)
+.if !empty(_LIBS) && !defined(INTERNALLIB)
 stage_libs: ${_LIBS}
 all: stage_libs
 .endif
+.if !empty(INCS) || !empty(INCSGROUPS)
+prebuild: buildincludes
+.endif
 .include <meta.stage.mk>
 .endif
 .endif