diff options
| author | marcel <marcel@FreeBSD.org> | 2013-05-24 15:53:13 +0000 |
|---|---|---|
| committer | marcel <marcel@FreeBSD.org> | 2013-05-24 15:53:13 +0000 |
| commit | 6436670995875e6f283ae1e440c7a620b6eff675 (patch) | |
| tree | f0dafebb31c650cbbc15104709fc121a5b255541 | |
| parent | fce7efdc5db4acbf4fa92ce991dc1f0a5da94d25 (diff) | |
| download | FreeBSD-src-6436670995875e6f283ae1e440c7a620b6eff675.zip FreeBSD-src-6436670995875e6f283ae1e440c7a620b6eff675.tar.gz | |
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.
| -rw-r--r-- | Makefile.inc1 | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/Makefile.inc1 b/Makefile.inc1 index f0649ef..fe8ea42 100644 --- a/Makefile.inc1 +++ b/Makefile.inc1 @@ -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}; \ |
