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.
This commit is contained in:
parent
657d1848ae
commit
7c996c4acc
Notes:
svn2git
2020-12-20 02:59:44 +00:00
svn path=/head/; revision=133956
@ -781,7 +781,6 @@ build-tools:
|
|||||||
bin/csh \
|
bin/csh \
|
||||||
bin/sh \
|
bin/sh \
|
||||||
${_rescue} \
|
${_rescue} \
|
||||||
gnu/usr.bin/cc/cc_tools \
|
|
||||||
lib/libncurses \
|
lib/libncurses \
|
||||||
${_share} \
|
${_share} \
|
||||||
${_aicasm} \
|
${_aicasm} \
|
||||||
@ -794,6 +793,7 @@ build-tools:
|
|||||||
${MAKE} DIRPRFX=${_tool}/ build-tools
|
${MAKE} DIRPRFX=${_tool}/ build-tools
|
||||||
.endfor
|
.endfor
|
||||||
.for _tool in \
|
.for _tool in \
|
||||||
|
gnu/usr.bin/cc/cc_tools \
|
||||||
${_kerberos5_tools}
|
${_kerberos5_tools}
|
||||||
${_+_}@${ECHODIR} "===> ${_tool}"; \
|
${_+_}@${ECHODIR} "===> ${_tool}"; \
|
||||||
cd ${.CURDIR}/${_tool}; \
|
cd ${.CURDIR}/${_tool}; \
|
||||||
|
@ -73,8 +73,6 @@ gen-time-stamp: genattr genattrtab genconditions genconstants genemit \
|
|||||||
touch ${.TARGET}
|
touch ${.TARGET}
|
||||||
|
|
||||||
.for F in attr codes config emit extract flags opinit output peep recog
|
.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 \
|
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}
|
read-rtl.o insn-conditions.o min-insn-modes.o errors.o ${LIBIBERTY}
|
||||||
${CC} ${CFLAGS} ${LDFLAGS} -o ${.TARGET} ${.ALLSRC}
|
${CC} ${CFLAGS} ${LDFLAGS} -o ${.TARGET} ${.ALLSRC}
|
||||||
@ -86,8 +84,6 @@ CLEANFILES+= gen$F
|
|||||||
#
|
#
|
||||||
# genattrtab needs more complex build rule
|
# genattrtab needs more complex build rule
|
||||||
#
|
#
|
||||||
build-tools: genattrtab
|
|
||||||
|
|
||||||
genattrtab : genattrtab.o rtl.o print-rtl.o bitmap.o gensupport.o ggc-none.o \
|
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 \
|
read-rtl.o insn-conditions.o genautomata.o varray.o min-insn-modes.o \
|
||||||
errors.o ${LIBIBERTY}
|
errors.o ${LIBIBERTY}
|
||||||
@ -101,8 +97,6 @@ CLEANFILES+= genattrtab
|
|||||||
# they should be liked with dummy-conditions.o stubs instead
|
# they should be liked with dummy-conditions.o stubs instead
|
||||||
#
|
#
|
||||||
.for F in constants conditions
|
.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}
|
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}
|
${CC} ${CFLAGS} ${LDFLAGS} -o ${.TARGET} ${.ALLSRC}
|
||||||
|
|
||||||
@ -111,8 +105,6 @@ CLEANFILES+= gen$F
|
|||||||
.endfor
|
.endfor
|
||||||
|
|
||||||
.for F in modes check genrtl preds
|
.for F in modes check genrtl preds
|
||||||
build-tools: gen$F
|
|
||||||
|
|
||||||
gen$F: gen$F.o errors.o ${LIBIBERTY}
|
gen$F: gen$F.o errors.o ${LIBIBERTY}
|
||||||
${CC} ${CFLAGS} ${LDFLAGS} -o ${.TARGET} ${.ALLSRC}
|
${CC} ${CFLAGS} ${LDFLAGS} -o ${.TARGET} ${.ALLSRC}
|
||||||
|
|
||||||
@ -207,7 +199,6 @@ CLEANFILES+= gt-*.h gtype-*.h
|
|||||||
|
|
||||||
.if !defined(NO_FORTRAN)
|
.if !defined(NO_FORTRAN)
|
||||||
gen-time-stamp: fini
|
gen-time-stamp: fini
|
||||||
build-tools: fini
|
|
||||||
fini: fini.o ${LIBIBERTY}
|
fini: fini.o ${LIBIBERTY}
|
||||||
${CC} ${CFLAGS} ${LDFLAGS} -o ${.TARGET} ${.ALLSRC}
|
${CC} ${CFLAGS} ${LDFLAGS} -o ${.TARGET} ${.ALLSRC}
|
||||||
SRCS+= fini.c
|
SRCS+= fini.c
|
||||||
@ -470,7 +461,6 @@ SRCS+= ${GENSRCS}
|
|||||||
CLEANFILES+= ${GENSRCS}
|
CLEANFILES+= ${GENSRCS}
|
||||||
|
|
||||||
all: ${SRCS}
|
all: ${SRCS}
|
||||||
build-tools: ${SRCS}
|
|
||||||
|
|
||||||
.include <bsd.prog.mk>
|
.include <bsd.prog.mk>
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user