From owner-svn-src-head@FreeBSD.ORG  Tue Apr  9 20:21:36 2013
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@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 75D84E2B;
 Tue,  9 Apr 2013 20:21:36 +0000 (UTC) (envelope-from dim@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 6857DAC0;
 Tue,  9 Apr 2013 20:21:36 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.6/8.14.6) with ESMTP id r39KLaIZ034939;
 Tue, 9 Apr 2013 20:21:36 GMT (envelope-from dim@svn.freebsd.org)
Received: (from dim@localhost)
 by svn.freebsd.org (8.14.6/8.14.5/Submit) id r39KLaB6034938;
 Tue, 9 Apr 2013 20:21:36 GMT (envelope-from dim@svn.freebsd.org)
Message-Id: <201304092021.r39KLaB6034938@svn.freebsd.org>
From: Dimitry Andric <dim@FreeBSD.org>
Date: Tue, 9 Apr 2013 20:21:36 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r249316 - head
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 09 Apr 2013 20:21:36 -0000

Author: dim
Date: Tue Apr  9 20:21:35 2013
New Revision: 249316
URL: http://svnweb.freebsd.org/changeset/base/249316

Log:
  Ensure make -j N universe works correctly, by checking for an up-to-date
  make before starting the universe targets themselves.  Otherwise, all of
  the targets would attempt to build make simultaneously, overwriting each
  other's copies of the make object files and executable.  This could lead
  to strange errors, for example when partially-written make executables
  are invoked.
  
  Also amend r216620, to make the rest of universe wait properly until the
  upgrade_checks target is finished, by adding universe_${target}_prologue
  to the .ORDER target.  Otherwise, make will be too smart for its own
  good, and start building the universe targets simultaneously with the
  prologues anyway.
  
  MFC after:	1 week

Modified:
  head/Makefile

Modified: head/Makefile
==============================================================================
--- head/Makefile	Tue Apr  9 19:36:34 2013	(r249315)
+++ head/Makefile	Tue Apr  9 20:21:35 2013	(r249316)
@@ -361,7 +361,7 @@ MAKEFAIL=tee -a ${FAILFILE}
 MAKEFAIL=cat
 .endif
 
-universe: universe_prologue
+universe: universe_prologue upgrade_checks
 universe_prologue:
 	@echo "--------------------------------------------------------------"
 	@echo ">>> make universe started on ${STARTTIME}"
@@ -371,7 +371,7 @@ universe_prologue:
 .endif
 .for target in ${TARGETS}
 universe: universe_${target}
-.ORDER: universe_prologue universe_${target} universe_epilogue
+.ORDER: universe_prologue upgrade_checks universe_${target}_prologue universe_${target} universe_epilogue
 universe_${target}: universe_${target}_prologue
 universe_${target}_prologue:
 	@echo ">> ${target} started on `LC_ALL=C date`"