Mon Aug 31 06:44:12 2020 UTC ()
make(1): fix copy-and-paste mistake for compiling with GCC10


(rillig)
diff -r1.96 -r1.97 src/usr.bin/make/Makefile
cvs diff -r1.96 -r1.97 src/usr.bin/make/Makefile (expand / switch to unified diff)

--- src/usr.bin/make/Makefile 2020/08/28 20:57:54 1.96
+++ src/usr.bin/make/Makefile 2020/08/31 06:44:12 1.97
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.96 2020/08/28 20:57:54 rillig Exp $ 1# $NetBSD: Makefile,v 1.97 2020/08/31 06:44:12 rillig Exp $
2# @(#)Makefile 5.2 (Berkeley) 12/28/90 2# @(#)Makefile 5.2 (Berkeley) 12/28/90
3 3
4PROG= make 4PROG= make
5SRCS= arch.c 5SRCS= arch.c
6SRCS+= buf.c 6SRCS+= buf.c
7SRCS+= compat.c 7SRCS+= compat.c
8SRCS+= cond.c 8SRCS+= cond.c
9SRCS+= dir.c 9SRCS+= dir.c
10SRCS+= enum.c 10SRCS+= enum.c
11SRCS+= for.c 11SRCS+= for.c
12SRCS+= hash.c 12SRCS+= hash.c
13SRCS+= job.c 13SRCS+= job.c
14SRCS+= lst.c 14SRCS+= lst.c
@@ -121,27 +121,27 @@ SUBDIR+= unit-tests @@ -121,27 +121,27 @@ SUBDIR+= unit-tests
121.endif 121.endif
122 122
123${SRCS:M*.c:.c=.o}: ${HDRS} 123${SRCS:M*.c:.c=.o}: ${HDRS}
124 124
125.include <bsd.prog.mk> 125.include <bsd.prog.mk>
126.include <bsd.subdir.mk> 126.include <bsd.subdir.mk>
127 127
128CPPFLAGS+= -DMAKE_NATIVE 128CPPFLAGS+= -DMAKE_NATIVE
129COPTS.job.c+= -Wno-format-nonliteral 129COPTS.job.c+= -Wno-format-nonliteral
130COPTS.parse.c+= -Wno-format-nonliteral 130COPTS.parse.c+= -Wno-format-nonliteral
131COPTS.var.c+= -Wno-format-nonliteral 131COPTS.var.c+= -Wno-format-nonliteral
132 132
133.if ${USE_GCC10} == "yes" 133.if ${USE_GCC10} == "yes"
134GCC9BASE?= /usr/pkg/gcc10 134GCC10BASE?= /usr/pkg/gcc10
135CC= ${GCC10BASE}/bin/gcc 135CC= ${GCC10BASE}/bin/gcc
136GCOV= ${GCC10BASE}/bin/gcov 136GCOV= ${GCC10BASE}/bin/gcov
137.endif 137.endif
138 138
139.if ${USE_GCC9} == "yes" 139.if ${USE_GCC9} == "yes"
140GCC9BASE?= /usr/pkg/gcc9 140GCC9BASE?= /usr/pkg/gcc9
141CC= ${GCC9BASE}/bin/gcc 141CC= ${GCC9BASE}/bin/gcc
142GCOV= ${GCC9BASE}/bin/gcov 142GCOV= ${GCC9BASE}/bin/gcov
143.endif 143.endif
144 144
145.if ${USE_GCC8} == "yes" 145.if ${USE_GCC8} == "yes"
146GCC8BASE?= /usr/pkg/gcc8 146GCC8BASE?= /usr/pkg/gcc8
147CC= ${GCC8BASE}/bin/gcc 147CC= ${GCC8BASE}/bin/gcc