cvs commit: src Makefile.inc1

[Ruslan Ermilov]

On Mon, Jun 30, 2003 at 08:50:02AM -0700, Gordon Tetlow wrote:
> On Mon, Jun 30, 2003 at 02:37:41PM +0300, Ruslan Ermilov wrote:
> >
> > Please de-pessimize the building of crunchide(1) by putting it
> > back as ${_crunchide} and only building it for RELEASEDIR or
> > !defined(NO_RESCUE) cases.
> > 
> > Please also move crunchgen(1) to bootstrap-tools; only tools
> > that use TARGET_ARCH should be put into cross-tools.  Please
> > also de-pessimize its building by wrapping it to the
> > ${BOOTSTRAPPING} version test (anything that's built using
> > crunchgen.c,v 1.33 should be sufficient and not require
> > bootstrapping).
> > 
> > Please let me know if I should generate the patch.  :-)
> 
> If you don't mind. It sounds like you have a better idea of what needs
> to be done.
> 
Sure, attached.


Cheers,
-- 
Ruslan Ermilov		Sysadmin and DBA,
ru at sunbay.com		Sunbay Software Ltd,
ru at FreeBSD.org		FreeBSD committer
-------------- next part --------------
Index: Makefile.inc1
===================================================================
RCS file: /home/ncvs/src/Makefile.inc1,v
retrieving revision 1.370
diff -u -r1.370 Makefile.inc1
--- Makefile.inc1	30 Jun 2003 05:59:35 -0000	1.370
+++ Makefile.inc1	30 Jun 2003 21:41:18 -0000
@@ -668,6 +668,11 @@
 _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 @@
 .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,16 @@
 _elf2aout=	usr.bin/elf2aout
 .endif
 
+.if exists(${.CURDIR}/rescue) && !defined(NO_RESCUE) || \
+    defined(RELEASEDIR)
+_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}; \
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 187 bytes
Desc: not available
Url : http://lists.freebsd.org/pipermail/cvs-all/attachments/20030701/ac0ade8f/attachment.bin