From owner-svn-src-all@FreeBSD.ORG  Fri May 24 15:53:13 2013
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@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 8A08BFB0;
 Fri, 24 May 2013 15:53:13 +0000 (UTC)
 (envelope-from marcel@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 7CD7CAA0;
 Fri, 24 May 2013 15:53:13 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.6/8.14.6) with ESMTP id r4OFrDEZ079388;
 Fri, 24 May 2013 15:53:13 GMT (envelope-from marcel@svn.freebsd.org)
Received: (from marcel@localhost)
 by svn.freebsd.org (8.14.6/8.14.5/Submit) id r4OFrDi3079387;
 Fri, 24 May 2013 15:53:13 GMT (envelope-from marcel@svn.freebsd.org)
Message-Id: <201305241553.r4OFrDi3079387@svn.freebsd.org>
From: Marcel Moolenaar <marcel@FreeBSD.org>
Date: Fri, 24 May 2013 15:53:13 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r250969 - head
X-SVN-Group: head
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: Fri, 24 May 2013 15:53:13 -0000

Author: marcel
Date: Fri May 24 15:53:13 2013
New Revision: 250969
URL: http://svnweb.freebsd.org/changeset/base/250969

Log:
  Fix building on slightly older -current and stable systems after
  the switch to bmake. The rescue bits are built via crunchgen,
  which didn't respect the MAKE environment variable until r237574
  (i.e. ~11 months ago). This resulted in a failure due to bmake's
  internal -J flag being passed around and not being understood by
  the standard (i.e. host's) make.
  Note that the failure is conditional upon having the jobServer
  feature enabled within bmake.

Modified:
  head/Makefile.inc1

Modified: head/Makefile.inc1
==============================================================================
--- head/Makefile.inc1	Fri May 24 14:57:38 2013	(r250968)
+++ head/Makefile.inc1	Fri May 24 15:53:13 2013	(r250969)
@@ -1215,6 +1215,10 @@ _yacc=		lib/liby \
 		usr.bin/yacc
 .endif
 
+.if ${BOOTSTRAPPING} < 1000014
+_crunch=	usr.sbin/crunch
+.endif
+
 .if ${BOOTSTRAPPING} < 1000026
 _nmtree=	lib/libnetbsd \
 		usr.sbin/nmtree
@@ -1293,6 +1297,7 @@ bootstrap-tools:
     usr.bin/xinstall \
     ${_gensnmptree} \
     usr.sbin/config \
+    ${_crunch} \
     ${_nmtree}
 	${_+_}@${ECHODIR} "===> ${_tool} (obj,depend,all,install)"; \
 		cd ${.CURDIR}/${_tool}; \