From owner-svn-src-projects@FreeBSD.ORG  Thu Nov  8 21:36:20 2012
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
 by hub.freebsd.org (Postfix) with ESMTP id 0E520897;
 Thu,  8 Nov 2012 21:36:20 +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 E7DB58FC0C;
 Thu,  8 Nov 2012 21:36:19 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id qA8LaJiR028630;
 Thu, 8 Nov 2012 21:36:19 GMT (envelope-from sjg@svn.freebsd.org)
Received: (from sjg@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id qA8LaJjH028629;
 Thu, 8 Nov 2012 21:36:19 GMT (envelope-from sjg@svn.freebsd.org)
Message-Id: <201211082136.qA8LaJjH028629@svn.freebsd.org>
From: "Simon J. Gerraty" <sjg@FreeBSD.org>
Date: Thu, 8 Nov 2012 21:36:19 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
Subject: svn commit: r242798 - 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: Thu, 08 Nov 2012 21:36:20 -0000

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