Mon Aug 31 16:41:19 2020 UTC ()
make(1): fix compilation with GCC 8


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

--- src/usr.bin/make/Makefile 2020/08/31 06:44:12 1.97
+++ src/usr.bin/make/Makefile 2020/08/31 16:41:19 1.98
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.97 2020/08/31 06:44:12 rillig Exp $ 1# $NetBSD: Makefile,v 1.98 2020/08/31 16:41:19 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
@@ -79,26 +79,27 @@ COPTS.main.c+= -Wno-error=format-truncat @@ -79,26 +79,27 @@ COPTS.main.c+= -Wno-error=format-truncat
79COPTS.meta.c+= -Wno-error=format-truncation 79COPTS.meta.c+= -Wno-error=format-truncation
80COPTS.parse.c+= -Wno-error=format-truncation 80COPTS.parse.c+= -Wno-error=format-truncation
81.endif 81.endif
82 82
83# Whether to compile with GCC 8 from pkgsrc, during development. 83# Whether to compile with GCC 8 from pkgsrc, during development.
84USE_GCC8?= no 84USE_GCC8?= no
85.if ${USE_GCC8} == "yes" 85.if ${USE_GCC8} == "yes"
86# CC is set further down in this file 86# CC is set further down in this file
87COPTS+= -Wno-attributes # for abs and labs 87COPTS+= -Wno-attributes # for abs and labs
88COPTS.arch.c+= -Wno-error=format-truncation 88COPTS.arch.c+= -Wno-error=format-truncation
89COPTS.dir.c+= -Wno-error=format-truncation 89COPTS.dir.c+= -Wno-error=format-truncation
90COPTS.main.c+= -Wno-error=format-truncation 90COPTS.main.c+= -Wno-error=format-truncation
91COPTS.meta.c+= -Wno-error=format-truncation 91COPTS.meta.c+= -Wno-error=format-truncation
 92COPTS.parse.c+= -Wno-error=format-truncation
92.endif 93.endif
93 94
94USE_META?= yes 95USE_META?= yes
95.if ${USE_META:tl} != "no" 96.if ${USE_META:tl} != "no"
96 97
97SRCS+= meta.c 98SRCS+= meta.c
98CPPFLAGS+= -DUSE_META 99CPPFLAGS+= -DUSE_META
99 100
100USE_FILEMON?= ktrace 101USE_FILEMON?= ktrace
101. if ${USE_FILEMON:tl} != "no" 102. if ${USE_FILEMON:tl} != "no"
102 103
103.PATH: ${.CURDIR}/filemon 104.PATH: ${.CURDIR}/filemon
104SRCS+= filemon_${USE_FILEMON}.c 105SRCS+= filemon_${USE_FILEMON}.c