[src/trunk]: src/usr.bin/make make(1): move COPTS above <bsd.prog.mk>

[rillig <rillig%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/9ace1a459f1a
branches:  trunk
changeset: 946700:9ace1a459f1a
user:      rillig <rillig%NetBSD.org@localhost>
date:      Sun Dec 06 12:54:32 2020 +0000

description:
make(1): move COPTS above <bsd.prog.mk>

diffstat:

 usr.bin/make/Makefile |  18 +++++++++---------
 1 files changed, 9 insertions(+), 9 deletions(-)

diffs (43 lines):

diff -r 6855c73315f4 -r 9ace1a459f1a usr.bin/make/Makefile
--- a/usr.bin/make/Makefile     Sun Dec 06 12:47:12 2020 +0000
+++ b/usr.bin/make/Makefile     Sun Dec 06 12:54:32 2020 +0000
@@ -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 @@
 ${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 @@
 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.