From owner-svn-src-all@FreeBSD.ORG  Tue Apr 16 06:53:21 2013
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115])
 by hub.freebsd.org (Postfix) with ESMTP id 1F8EAC3B;
 Tue, 16 Apr 2013 06:53:21 +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 1265F6F;
 Tue, 16 Apr 2013 06:53:21 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.6/8.14.6) with ESMTP id r3G6rK9x038589;
 Tue, 16 Apr 2013 06:53:20 GMT (envelope-from dim@svn.freebsd.org)
Received: (from dim@localhost)
 by svn.freebsd.org (8.14.6/8.14.5/Submit) id r3G6rKwo038588;
 Tue, 16 Apr 2013 06:53:20 GMT (envelope-from dim@svn.freebsd.org)
Message-Id: <201304160653.r3G6rKwo038588@svn.freebsd.org>
From: Dimitry Andric <dim@FreeBSD.org>
Date: Tue, 16 Apr 2013 06:53:20 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org
Subject: svn commit: r249536 - stable/7
X-SVN-Group: stable-7
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
 user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 16 Apr 2013 06:53:21 -0000

Author: dim
Date: Tue Apr 16 06:53:20 2013
New Revision: 249536
URL: http://svnweb.freebsd.org/changeset/base/249536

Log:
  MFC r249316:
  
  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.

Modified:
  stable/7/Makefile   (contents, props changed)

Modified: stable/7/Makefile
==============================================================================
--- stable/7/Makefile	Tue Apr 16 06:52:32 2013	(r249535)
+++ stable/7/Makefile	Tue Apr 16 06:53:20 2013	(r249536)
@@ -274,7 +274,7 @@ make: .PHONY
 .if make(universe)
 TARGETS?=amd64 arm i386 ia64 pc98 powerpc sparc64
 
-universe: universe_prologue
+universe: universe_prologue upgrade_checks
 universe_prologue:
 	@echo "--------------------------------------------------------------"
 	@echo ">>> make universe started on ${STARTTIME}"
@@ -285,7 +285,7 @@ KERNCONFS!=	cd ${.CURDIR}/sys/${target}/
 		! -name DEFAULTS ! -name LINT
 KERNCONFS:=	${KERNCONFS:S/^NOTES$/LINT/}
 universe: universe_${target}
-.ORDER: universe_prologue universe_${target} universe_epilogue
+.ORDER: universe_prologue upgrade_checks universe_${target}_prologue universe_${target} universe_epilogue
 universe_${target}:
 .if !defined(MAKE_JUST_KERNELS)
 	@echo ">> ${target} started on `LC_ALL=C date`"