summaryrefslogtreecommitdiff
path: root/sbin
diff options
context:
space:
mode:
authorlukem <lukem@NetBSD.org>2023-06-03 08:52:53 +0000
committerlukem <lukem@NetBSD.org>2023-06-03 08:52:53 +0000
commitabaa8cb87058c08ad0688c849a28f4e007c07bbb (patch)
treeb605286f3fba170e6cbf35b5f30a1a915e19d120 /sbin
parent4e669cc7c9ec3b3364a9f7d56e92bdf770cca438 (diff)
bsd.own.mk: rename to CC_WNO_ADDRESS_OF_PACKED_MEMBER
Provide a single variable CC_WNO_ADDRESS_OF_PACKED_MEMBER with options for both clang and gcc, to replace CLANG_NO_ADDR_OF_PACKED_MEMBER CC_NO_ADDR_OF_PACKED_MEMBER GCC_NO_ADDR_OF_PACKED_MEMBER Using the convention CC_compilerflag, where compilerflag is based on the full compiler flag name.
Diffstat (limited to 'sbin')
-rw-r--r--sbin/dump/Makefile4
-rw-r--r--sbin/fsck_ffs/Makefile4
-rw-r--r--sbin/fsck_udf/Makefile4
-rw-r--r--sbin/fsck_v7fs/Makefile4
-rw-r--r--sbin/fsdb/Makefile4
-rw-r--r--sbin/newfs/Makefile4
-rw-r--r--sbin/newfs_udf/Makefile4
-rw-r--r--sbin/newfs_v7fs/Makefile4
-rw-r--r--sbin/nvmectl/Makefile4
9 files changed, 18 insertions, 18 deletions
diff --git a/sbin/dump/Makefile b/sbin/dump/Makefile
index 6933a1345a1..897ccfbe255 100644
--- a/sbin/dump/Makefile
+++ b/sbin/dump/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.41 2020/09/06 07:20:27 mrg Exp $
+# $NetBSD: Makefile,v 1.42 2023/06/03 08:52:55 lukem Exp $
# @(#)Makefile 8.1 (Berkeley) 6/5/93
# dump.h header file
@@ -39,7 +39,7 @@ LDADD+= -lutil
COPTS.ffs_inode.c+= -Wno-pointer-sign
COPTS.traverse.c+= ${GCC_NO_FORMAT_TRUNCATION}
-CWARNFLAGS.gcc+= ${GCC_NO_ADDR_OF_PACKED_MEMBER}
+CWARNFLAGS.gcc+= ${CC_WNO_ADDRESS_OF_PACKED_MEMBER}
CWARNFLAGS.gcc+= ${GCC_NO_FORMAT_TRUNCATION}
.include <bsd.prog.mk>
diff --git a/sbin/fsck_ffs/Makefile b/sbin/fsck_ffs/Makefile
index e8dd9e4b306..d40989f1e7b 100644
--- a/sbin/fsck_ffs/Makefile
+++ b/sbin/fsck_ffs/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.50 2020/09/06 07:20:27 mrg Exp $
+# $NetBSD: Makefile,v 1.51 2023/06/03 08:52:55 lukem Exp $
# @(#)Makefile 8.2 (Berkeley) 4/27/95
# when making a change to this file, please check if the change is
@@ -13,7 +13,7 @@ SUBDIR.roff= SMM.doc
.include "Makefile.common"
-CWARNFLAGS.gcc+= ${GCC_NO_ADDR_OF_PACKED_MEMBER}
+CWARNFLAGS.gcc+= ${CC_WNO_ADDRESS_OF_PACKED_MEMBER}
.include <bsd.prog.mk>
.include <bsd.subdir.mk>
diff --git a/sbin/fsck_udf/Makefile b/sbin/fsck_udf/Makefile
index 19f3c6bd161..4470fa1f40a 100644
--- a/sbin/fsck_udf/Makefile
+++ b/sbin/fsck_udf/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2022/04/06 13:35:50 reinoud Exp $
+# $NetBSD: Makefile,v 1.2 2023/06/03 08:52:55 lukem Exp $
.include <bsd.own.mk>
@@ -18,6 +18,6 @@ DPADD+=${LIBUTIL}
LDADD+=-lutil -lprop
CWARNFLAGS.clang+= -Wno-error=address-of-packed-member
-CWARNFLAGS.gcc+= ${GCC_NO_ADDR_OF_PACKED_MEMBER}
+CWARNFLAGS.gcc+= ${CC_WNO_ADDRESS_OF_PACKED_MEMBER}
.include <bsd.prog.mk>
diff --git a/sbin/fsck_v7fs/Makefile b/sbin/fsck_v7fs/Makefile
index 5796a9ee41f..7bf33c1d672 100644
--- a/sbin/fsck_v7fs/Makefile
+++ b/sbin/fsck_v7fs/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2020/09/06 07:20:27 mrg Exp $
+# $NetBSD: Makefile,v 1.4 2023/06/03 08:52:55 lukem Exp $
.include <bsd.own.mk>
@@ -17,6 +17,6 @@ CPPFLAGS+= -I${FSCK} -I${V7FS} -DV7FS_EI
LDADD+=-lutil
DPADD+=${LIBUTIL}
-CWARNFLAGS.gcc+= ${GCC_NO_ADDR_OF_PACKED_MEMBER}
+CWARNFLAGS.gcc+= ${CC_WNO_ADDRESS_OF_PACKED_MEMBER}
.include <bsd.prog.mk>
diff --git a/sbin/fsdb/Makefile b/sbin/fsdb/Makefile
index e63ea805840..c039f73a1eb 100644
--- a/sbin/fsdb/Makefile
+++ b/sbin/fsdb/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.41 2021/04/15 01:56:00 mrg Exp $
+# $NetBSD: Makefile,v 1.42 2023/06/03 08:52:55 lukem Exp $
# @(#)Makefile 8.1 (Berkeley) 6/5/93
.include <bsd.own.mk>
@@ -45,6 +45,6 @@ COPTS.inode.c+= -O0
COPTS.fsdb.c+= -O0
.endif
-CWARNFLAGS.gcc+= ${GCC_NO_ADDR_OF_PACKED_MEMBER}
+CWARNFLAGS.gcc+= ${CC_WNO_ADDRESS_OF_PACKED_MEMBER}
.include <bsd.prog.mk>
diff --git a/sbin/newfs/Makefile b/sbin/newfs/Makefile
index 0a8ba331b67..56fd4df2917 100644
--- a/sbin/newfs/Makefile
+++ b/sbin/newfs/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.41 2020/09/06 07:20:27 mrg Exp $
+# $NetBSD: Makefile,v 1.42 2023/06/03 08:52:55 lukem Exp $
# @(#)Makefile 8.2 (Berkeley) 3/27/94
# when making a change to this file, please check if the change is
@@ -15,6 +15,6 @@ MLINKS= mount_mfs.8 mfs.8
.include "Makefile.common"
-CWARNFLAGS.gcc+= ${GCC_NO_ADDR_OF_PACKED_MEMBER}
+CWARNFLAGS.gcc+= ${CC_WNO_ADDRESS_OF_PACKED_MEMBER}
.include <bsd.prog.mk>
diff --git a/sbin/newfs_udf/Makefile b/sbin/newfs_udf/Makefile
index 1ca327586b9..66ed06c1a60 100644
--- a/sbin/newfs_udf/Makefile
+++ b/sbin/newfs_udf/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2022/04/06 13:29:15 reinoud Exp $
+# $NetBSD: Makefile,v 1.9 2023/06/03 08:52:55 lukem Exp $
.include <bsd.own.mk>
@@ -16,6 +16,6 @@ DPADD+=${LIBUTIL}
LDADD+=-lutil -lprop
CWARNFLAGS.clang+= -Wno-error=address-of-packed-member
-CWARNFLAGS.gcc+= ${GCC_NO_ADDR_OF_PACKED_MEMBER}
+CWARNFLAGS.gcc+= ${CC_WNO_ADDRESS_OF_PACKED_MEMBER}
.include <bsd.prog.mk>
diff --git a/sbin/newfs_v7fs/Makefile b/sbin/newfs_v7fs/Makefile
index 6af8d9a3c95..6d67950332e 100644
--- a/sbin/newfs_v7fs/Makefile
+++ b/sbin/newfs_v7fs/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2020/09/06 07:20:28 mrg Exp $
+# $NetBSD: Makefile,v 1.6 2023/06/03 08:52:55 lukem Exp $
.include <bsd.own.mk>
@@ -18,6 +18,6 @@ CPPFLAGS+=-DV7FS_EI -I${V7FS} -I${FSCK}
COPTS.newfs_v7fs.c+= -Wno-pointer-sign
-CWARNFLAGS.gcc+= ${GCC_NO_ADDR_OF_PACKED_MEMBER}
+CWARNFLAGS.gcc+= ${CC_WNO_ADDRESS_OF_PACKED_MEMBER}
.include <bsd.prog.mk>
diff --git a/sbin/nvmectl/Makefile b/sbin/nvmectl/Makefile
index b03d4227a17..6227f400f67 100644
--- a/sbin/nvmectl/Makefile
+++ b/sbin/nvmectl/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2020/09/06 07:20:28 mrg Exp $
+# $NetBSD: Makefile,v 1.6 2023/06/03 08:52:56 lukem Exp $
.include <bsd.own.mk>
@@ -20,6 +20,6 @@ MAN= nvmectl.8
DPADD+= ${LIBUTIL}
LDADD+= -lutil
-CWARNFLAGS.gcc+= ${GCC_NO_ADDR_OF_PACKED_MEMBER}
+CWARNFLAGS.gcc+= ${CC_WNO_ADDRESS_OF_PACKED_MEMBER}
.include <bsd.prog.mk>