diff options
| -rw-r--r-- | Makefile.inc1 | 16 |
1 files changed, 13 insertions, 3 deletions
diff --git a/Makefile.inc1 b/Makefile.inc1 index ced79eeb25cf..11c760d1f717 100644 --- a/Makefile.inc1 +++ b/Makefile.inc1 @@ -668,6 +668,11 @@ _xargs= usr.bin/xargs _yacc= usr.bin/yacc .endif +.if exists(${.CURDIR}/rescue) && !defined(NO_RESCUE) && \ + ${BOOTSTRAPPING} < 501100 +_crunchgen= usr.sbin/crunch/crunchgen +.endif + .if ${BOOTSTRAPPING} < 500019 _kbdcontrol= usr.sbin/kbdcontrol .endif @@ -676,7 +681,7 @@ bootstrap-tools: .for _tool in ${_strfile} usr.bin/colldef \ usr.bin/makewhatis usr.bin/rpcgen ${_uudecode} \ ${_xargs} usr.bin/xinstall ${_yacc} \ - usr.sbin/config ${_kbdcontrol} \ + usr.sbin/config ${_crunchgen} ${_kbdcontrol} \ ${_gperf} ${_groff} gnu/usr.bin/texinfo @${ECHODIR} "===> ${_tool}"; \ cd ${.CURDIR}/${_tool}; \ @@ -736,12 +741,17 @@ _kgzip= usr.sbin/kgzip _elf2aout= usr.bin/elf2aout .endif +.if (exists(${.CURDIR}/rescue) && !defined(NO_RESCUE) || \ + defined(RELEASEDIR)) && \ + ( ${TARGET_ARCH} != ${MACHINE_ARCH} || ${BOOTSTRAPPING} < 501101 ) +_crunchide= usr.sbin/crunch/crunchide +.endif + _xlint= usr.bin/xlint/lint1 usr.bin/xlint/lint2 usr.bin/xlint/xlint cross-tools: .for _tool in ${_btxld} ${_elf2aout} ${_elf2exe} \ - gnu/usr.bin/binutils \ - usr.sbin/crunch/crunchgen usr.sbin/crunch/crunchide \ + gnu/usr.bin/binutils ${_crunchide} \ gnu/usr.bin/cc ${_xlint} ${_kgzip} @${ECHODIR} "===> ${_tool}"; \ cd ${.CURDIR}/${_tool}; \ |