Date: Fri, 24 May 2013 15:53:13 +0000 (UTC) From: Marcel Moolenaar <marcel@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r250969 - head Message-ID: <201305241553.r4OFrDi3079387@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
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}; \
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201305241553.r4OFrDi3079387>