From 7c996c4acc30905d9ff93c92804d9346846b17b9 Mon Sep 17 00:00:00 2001
From: Ruslan Ermilov <ru@FreeBSD.org>
Date: Wed, 18 Aug 2004 13:21:40 +0000
Subject: [PATCH] A fix from rev. 1.52 of gnu/usr.bin/cc/cc_tools/Makefile was
 lost in rev. 1.57.  Fix this regression by making cc_tools a new-style
 build-tool in Makefile.inc1.  For details of what has been fixed, please see
 the gnu/usr.bin/cc/cc_tools/Makefile,v 1.52 commit log.

Caught this by accidentally touching param.h while in the process
of cross-buildworld for amd64.
---
 Makefile.inc1                    |  2 +-
 gnu/usr.bin/cc/cc_tools/Makefile | 10 ----------
 2 files changed, 1 insertion(+), 11 deletions(-)

diff --git a/Makefile.inc1 b/Makefile.inc1
index 5b1ffb6a8ff0..3d792189c6e5 100644
--- a/Makefile.inc1
+++ b/Makefile.inc1
@@ -781,7 +781,6 @@ build-tools:
     bin/csh \
     bin/sh \
     ${_rescue} \
-    gnu/usr.bin/cc/cc_tools \
     lib/libncurses \
     ${_share} \
     ${_aicasm} \
@@ -794,6 +793,7 @@ build-tools:
 		${MAKE} DIRPRFX=${_tool}/ build-tools
 .endfor
 .for _tool in \
+    gnu/usr.bin/cc/cc_tools \
     ${_kerberos5_tools}
 	${_+_}@${ECHODIR} "===> ${_tool}"; \
 		cd ${.CURDIR}/${_tool}; \
diff --git a/gnu/usr.bin/cc/cc_tools/Makefile b/gnu/usr.bin/cc/cc_tools/Makefile
index 45d33e57f1b3..797434acb1b9 100644
--- a/gnu/usr.bin/cc/cc_tools/Makefile
+++ b/gnu/usr.bin/cc/cc_tools/Makefile
@@ -73,8 +73,6 @@ gen-time-stamp: genattr genattrtab genconditions genconstants genemit \
 	touch ${.TARGET}
 
 .for F in attr codes config emit extract flags opinit output peep recog
-build-tools: gen$F
-
 gen$F: gen$F.o rtl.o print-rtl.o bitmap.o gensupport.o  ggc-none.o \
 	read-rtl.o insn-conditions.o min-insn-modes.o errors.o ${LIBIBERTY}
 	${CC} ${CFLAGS} ${LDFLAGS} -o ${.TARGET} ${.ALLSRC}
@@ -86,8 +84,6 @@ CLEANFILES+=	gen$F
 #
 # genattrtab needs more complex build rule
 #
-build-tools: genattrtab
-
 genattrtab : genattrtab.o rtl.o print-rtl.o bitmap.o gensupport.o ggc-none.o \
 	read-rtl.o insn-conditions.o genautomata.o varray.o min-insn-modes.o \
 	errors.o ${LIBIBERTY}
@@ -101,8 +97,6 @@ CLEANFILES+=	genattrtab
 # they should be liked with dummy-conditions.o stubs instead
 #
 .for F in constants conditions
-build-tools: gen$F
-
 gen$F: gen$F.o rtl.o bitmap.o gensupport.o ggc-none.o read-rtl.o dummy-conditions.o min-insn-modes.o errors.o ${LIBIBERTY}
 	${CC} ${CFLAGS} ${LDFLAGS} -o ${.TARGET} ${.ALLSRC}
 
@@ -111,8 +105,6 @@ CLEANFILES+=	gen$F
 .endfor
 
 .for F in modes check genrtl preds
-build-tools: gen$F
-
 gen$F: gen$F.o errors.o ${LIBIBERTY}
 	${CC} ${CFLAGS} ${LDFLAGS} -o ${.TARGET} ${.ALLSRC}
 
@@ -207,7 +199,6 @@ CLEANFILES+=	gt-*.h gtype-*.h
 
 .if !defined(NO_FORTRAN)
 gen-time-stamp: fini
-build-tools: fini
 fini: fini.o ${LIBIBERTY}
 	${CC} ${CFLAGS} ${LDFLAGS} -o ${.TARGET} ${.ALLSRC}
 SRCS+=		fini.c
@@ -470,7 +461,6 @@ SRCS+=		${GENSRCS}
 CLEANFILES+=	${GENSRCS}
 
 all:		${SRCS}
-build-tools:	${SRCS}
 
 .include <bsd.prog.mk>