From owner-svn-src-head@FreeBSD.ORG  Sun Mar 31 02:03:35 2013
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115])
 by hub.freebsd.org (Postfix) with ESMTP id 1C987AD4;
 Sun, 31 Mar 2013 02:03:35 +0000 (UTC)
 (envelope-from andrew@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 0CF953C4;
 Sun, 31 Mar 2013 02:03:35 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.6/8.14.6) with ESMTP id r2V23Yka055652;
 Sun, 31 Mar 2013 02:03:34 GMT (envelope-from andrew@svn.freebsd.org)
Received: (from andrew@localhost)
 by svn.freebsd.org (8.14.6/8.14.5/Submit) id r2V23YfI055651;
 Sun, 31 Mar 2013 02:03:34 GMT (envelope-from andrew@svn.freebsd.org)
Message-Id: <201303310203.r2V23YfI055651@svn.freebsd.org>
From: Andrew Turner <andrew@FreeBSD.org>
Date: Sun, 31 Mar 2013 02:03:34 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r248937 - 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: Sun, 31 Mar 2013 02:03:35 -0000

Author: andrew
Date: Sun Mar 31 02:03:34 2013
New Revision: 248937
URL: http://svnweb.freebsd.org/changeset/base/248937

Log:
  When building universe ensure the required worlds are finished before
  starting the kernels. Before this the kernels would be built as part of the
  last architecture universe target. There can cause problems when this world
  finishes before the other worlds as the host compiler may be picked up
  rather than the target compiler.
  
  The solution is to add a target to build the universe kernels that depends
  on all the world targets finishing. As we may not be building a world only
  depend on it when MAKE_JUST_KERNELS is undefined.

Modified:
  head/Makefile

Modified: head/Makefile
==============================================================================
--- head/Makefile	Sat Mar 30 20:57:35 2013	(r248936)
+++ head/Makefile	Sun Mar 31 02:03:34 2013	(r248937)
@@ -392,6 +392,14 @@ universe_${target}_${target_arch}: unive
 .endfor
 .endif
 .if !defined(MAKE_JUST_WORLDS)
+# If we are building world and kernels wait for the required worlds to finish
+.if !defined(MAKE_JUST_KERNELS)
+.for target_arch in ${TARGET_ARCHES_${target}}
+universe_${target}_kernels: universe_${target}_${target_arch}
+.endfor
+.endif
+universe_${target}: universe_${target}_kernels
+universe_${target}_kernels: universe_${target}_prologue
 .if exists(${KERNSRCDIR}/${target}/conf/NOTES)
 	@(cd ${KERNSRCDIR}/${target}/conf && env __MAKE_CONF=/dev/null \
 	    ${MAKE} LINT > ${.CURDIR}/_.${target}.makeLINT 2>&1 || \