From owner-svn-src-user@freebsd.org  Mon Oct 19 18:29:18 2015
Return-Path: <owner-svn-src-user@freebsd.org>
Delivered-To: svn-src-user@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id AFF6BA198ED
 for <svn-src-user@mailman.ysv.freebsd.org>;
 Mon, 19 Oct 2015 18:29:18 +0000 (UTC) (envelope-from gjb@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 716BA8BC;
 Mon, 19 Oct 2015 18:29:18 +0000 (UTC) (envelope-from gjb@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id t9JITHew092029;
 Mon, 19 Oct 2015 18:29:17 GMT (envelope-from gjb@FreeBSD.org)
Received: (from gjb@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id t9JITH7n092028;
 Mon, 19 Oct 2015 18:29:17 GMT (envelope-from gjb@FreeBSD.org)
Message-Id: <201510191829.t9JITH7n092028@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: gjb set sender to gjb@FreeBSD.org
 using -f
From: Glen Barber <gjb@FreeBSD.org>
Date: Mon, 19 Oct 2015 18:29:17 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
Subject: svn commit: r289599 - user/gjb/thermite
X-SVN-Group: user
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-user@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: "SVN commit messages for the experimental &quot; user&quot;
 src tree" <svn-src-user.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-user>,
 <mailto:svn-src-user-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-user/>
List-Post: <mailto:svn-src-user@freebsd.org>
List-Help: <mailto:svn-src-user-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-user>,
 <mailto:svn-src-user-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 19 Oct 2015 18:29:18 -0000

Author: gjb
Date: Mon Oct 19 18:29:17 2015
New Revision: 289599
URL: https://svnweb.freebsd.org/changeset/base/289599

Log:
  Re-sync with releng repo:
  
  - Drop support for 9.x snapshot builds.
  - Remove explicit 'make ${MAKE}', which was needed to help
    the toolchain figure out what version of make(1) to build.
  
  Sponsored by:	The FreeBSD Foundation

Modified:
  user/gjb/thermite/thermite.sh

Modified: user/gjb/thermite/thermite.sh
==============================================================================
--- user/gjb/thermite/thermite.sh	Mon Oct 19 18:06:35 2015	(r289598)
+++ user/gjb/thermite/thermite.sh	Mon Oct 19 18:29:17 2015	(r289599)
@@ -480,18 +480,10 @@ install_chroots() {
 # Build amd64/i386 "seed" chroots for all branches being built.
 build_chroots() {
 	source_config || return 0
-	if [ ${rev} -le 8 ]; then
+	if [ ${rev} -le 9 ]; then
 		info "This script does not support rev ${rev}"
 		return 0
 	fi
-	# Building stable/9 on head/ is particularly race-prone when
-	# building make(1) for the first time.  I have no idea why.
-	# Apply duct tape for now.
-	if [ ${rev} -lt 10 ]; then
-		__makecmd="make"
-	else
-		__makecmd="bmake"
-	fi
 	case ${arch} in
 		i386)
 			_chrootarch="i386"
@@ -514,13 +506,6 @@ build_chroots() {
 			${_srcdir} \
 			>> ${logdir}/${_build}.log 2>&1
 	fi
-	info "Building ${_srcdir} make(1)"
-	env MAKEOBJDIRPREFIX=${_objdir} \
-		make -C ${_srcdir} ${WORLD_FLAGS} \
-		__MAKE_CONF=/dev/null SRCCONF=/dev/null \
-		TARGET=${_chrootarch} TARGET_ARCH=${_chrootarch} \
-		${__makecmd} >> \
-		${logdir}/${_build}.log 2>&1
 	info "Building ${_srcdir} world"
 	env MAKEOBJDIRPREFIX=${_objdir} \
 		make -C ${_srcdir} ${WORLD_FLAGS} \