Only bootstrap crunchide(1) and build crunchgen(1) when necessary.
The latter needs to be built either if it's used as a cross-tool (${TARGET_ARCH} != ${MACHINE_ARCH}) or if it has backward compat issues, like e.g. lack of the AMD64 support.
This commit is contained in:
parent
5d37567d73
commit
a3d6b3e7d7
@ -668,6 +668,11 @@ _xargs= usr.bin/xargs
|
|||||||
_yacc= usr.bin/yacc
|
_yacc= usr.bin/yacc
|
||||||
.endif
|
.endif
|
||||||
|
|
||||||
|
.if exists(${.CURDIR}/rescue) && !defined(NO_RESCUE) && \
|
||||||
|
${BOOTSTRAPPING} < 501100
|
||||||
|
_crunchgen= usr.sbin/crunch/crunchgen
|
||||||
|
.endif
|
||||||
|
|
||||||
.if ${BOOTSTRAPPING} < 500019
|
.if ${BOOTSTRAPPING} < 500019
|
||||||
_kbdcontrol= usr.sbin/kbdcontrol
|
_kbdcontrol= usr.sbin/kbdcontrol
|
||||||
.endif
|
.endif
|
||||||
@ -676,7 +681,7 @@ bootstrap-tools:
|
|||||||
.for _tool in ${_strfile} usr.bin/colldef \
|
.for _tool in ${_strfile} usr.bin/colldef \
|
||||||
usr.bin/makewhatis usr.bin/rpcgen ${_uudecode} \
|
usr.bin/makewhatis usr.bin/rpcgen ${_uudecode} \
|
||||||
${_xargs} usr.bin/xinstall ${_yacc} \
|
${_xargs} usr.bin/xinstall ${_yacc} \
|
||||||
usr.sbin/config ${_kbdcontrol} \
|
usr.sbin/config ${_crunchgen} ${_kbdcontrol} \
|
||||||
${_gperf} ${_groff} gnu/usr.bin/texinfo
|
${_gperf} ${_groff} gnu/usr.bin/texinfo
|
||||||
@${ECHODIR} "===> ${_tool}"; \
|
@${ECHODIR} "===> ${_tool}"; \
|
||||||
cd ${.CURDIR}/${_tool}; \
|
cd ${.CURDIR}/${_tool}; \
|
||||||
@ -736,12 +741,17 @@ _kgzip= usr.sbin/kgzip
|
|||||||
_elf2aout= usr.bin/elf2aout
|
_elf2aout= usr.bin/elf2aout
|
||||||
.endif
|
.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
|
_xlint= usr.bin/xlint/lint1 usr.bin/xlint/lint2 usr.bin/xlint/xlint
|
||||||
|
|
||||||
cross-tools:
|
cross-tools:
|
||||||
.for _tool in ${_btxld} ${_elf2aout} ${_elf2exe} \
|
.for _tool in ${_btxld} ${_elf2aout} ${_elf2exe} \
|
||||||
gnu/usr.bin/binutils \
|
gnu/usr.bin/binutils ${_crunchide} \
|
||||||
usr.sbin/crunch/crunchgen usr.sbin/crunch/crunchide \
|
|
||||||
gnu/usr.bin/cc ${_xlint} ${_kgzip}
|
gnu/usr.bin/cc ${_xlint} ${_kgzip}
|
||||||
@${ECHODIR} "===> ${_tool}"; \
|
@${ECHODIR} "===> ${_tool}"; \
|
||||||
cd ${.CURDIR}/${_tool}; \
|
cd ${.CURDIR}/${_tool}; \
|
||||||
|
Loading…
x
Reference in New Issue
Block a user