Module Name: src
Committed By: rillig
Date: Sun Dec 6 12:54:32 UTC 2020
Modified Files:
src/usr.bin/make: Makefile
Log Message:
make(1): move COPTS above <bsd.prog.mk>
To generate a diff of this commit:
cvs rdiff -u -r1.107 -r1.108 src/usr.bin/make/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.bin/make/Makefile
diff -u src/usr.bin/make/Makefile:1.107 src/usr.bin/make/Makefile:1.108
--- src/usr.bin/make/Makefile:1.107 Thu Dec 3 18:43:02 2020
+++ src/usr.bin/make/Makefile Sun Dec 6 12:54:32 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.107 2020/12/03 18:43:02 rillig Exp $
+# $NetBSD: Makefile,v 1.108 2020/12/06 12:54:32 rillig Exp $
# @(#)Makefile 5.2 (Berkeley) 12/28/90
PROG= make
@@ -126,13 +126,18 @@ SUBDIR+= unit-tests
${SRCS:M*.c:.c=.o}: ${HDRS}
CLEANFILES+= *.o
+COPTS.arch.c+= ${GCC_NO_FORMAT_TRUNCATION}
+COPTS.dir.c+= ${GCC_NO_FORMAT_TRUNCATION}
+COPTS.job.c+= -Wno-format-nonliteral
+COPTS.main.c+= ${GCC_NO_FORMAT_TRUNCATION} ${GCC_NO_STRINGOP_TRUNCATION}
+COPTS.meta.c+= ${GCC_NO_FORMAT_TRUNCATION}
+COPTS.parse.c+= -Wno-format-nonliteral
+COPTS.var.c+= -Wno-format-nonliteral
+
.include <bsd.prog.mk>
.include <bsd.subdir.mk>
CPPFLAGS+= -DMAKE_NATIVE
-COPTS.job.c+= -Wno-format-nonliteral
-COPTS.parse.c+= -Wno-format-nonliteral
-COPTS.var.c+= -Wno-format-nonliteral
.if ${USE_GCC10} == "yes"
GCC10BASE?= /usr/pkg/gcc10
@@ -159,11 +164,6 @@ LDADD+= -lutil
DPADD+= ${LIBUTIL}
.endif
-COPTS.arch.c+= ${GCC_NO_FORMAT_TRUNCATION}
-COPTS.dir.c+= ${GCC_NO_FORMAT_TRUNCATION}
-COPTS.main.c+= ${GCC_NO_FORMAT_TRUNCATION} ${GCC_NO_STRINGOP_TRUNCATION}
-COPTS.meta.c+= ${GCC_NO_FORMAT_TRUNCATION}
-
COPTS+= -Wdeclaration-after-statement
# For -DCLEANUP and similar feature toggles.
