summaryrefslogtreecommitdiff
path: root/usr.sbin
diff options
context:
space:
mode:
authorlukem <lukem@NetBSD.org>2023-06-03 21:26:27 +0000
committerlukem <lukem@NetBSD.org>2023-06-03 21:26:27 +0000
commitaf32d97d2105b31c6b5f9c9cf54aec9dd2416d78 (patch)
tree43b67b4d7dafc23ab764fa8facd78774be40cfac /usr.sbin
parentcd2a6834f02a5d50c1503a8b2d0b516f26d8a1bb (diff)
adapt to ${CC_WNO_ADDRESS_OF_PACKED_MEMBER}
Simplify CWARNFLAGS to use ${CC_WNO_ADDRESS_OF_PACKED_MEMBER} which works for both clang and gcc, and remove compiler-specific equivalents.
Diffstat (limited to 'usr.sbin')
-rw-r--r--usr.sbin/fstyp/Makefile6
-rw-r--r--usr.sbin/installboot/Makefile5
-rw-r--r--usr.sbin/makefs/udf/Makefile.inc6
-rw-r--r--usr.sbin/pf/Makefile.inc5
4 files changed, 10 insertions, 12 deletions
diff --git a/usr.sbin/fstyp/Makefile b/usr.sbin/fstyp/Makefile
index 9adb10b00fc..1d7954617aa 100644
--- a/usr.sbin/fstyp/Makefile
+++ b/usr.sbin/fstyp/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2023/06/03 08:53:00 lukem Exp $
+# $NetBSD: Makefile,v 1.14 2023/06/03 21:26:29 lukem Exp $
.include <bsd.own.mk>
@@ -31,7 +31,7 @@ CPPFLAGS.zfs.c+= -I${OSNET}/dist/uts/common/fs/zfs
CPPFLAGS.zfs.c+= -I${OSNET}/dist/lib/libnvpair
.endif
-CWARNFLAGS.clang+= -Wno-unknown-pragmas -Wno-error=address-of-packed-member
-CWARNFLAGS.gcc+= ${CC_WNO_ADDRESS_OF_PACKED_MEMBER}
+CWARNFLAGS.clang+= -Wno-unknown-pragmas
+CWARNFLAGS+= ${CC_WNO_ADDRESS_OF_PACKED_MEMBER}
.include <bsd.prog.mk>
diff --git a/usr.sbin/installboot/Makefile b/usr.sbin/installboot/Makefile
index da996811b0a..e31285b7776 100644
--- a/usr.sbin/installboot/Makefile
+++ b/usr.sbin/installboot/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.57 2023/06/03 08:53:00 lukem Exp $
+# $NetBSD: Makefile,v 1.58 2023/06/03 21:26:29 lukem Exp $
#
.include <bsd.own.mk>
@@ -87,7 +87,6 @@ LDADD+= -lutil
DPADD+= ${LIBUTIL}
.endif
-CWARNFLAGS.clang+= -Wno-error=address-of-packed-member
-CWARNFLAGS.gcc+= ${CC_WNO_ADDRESS_OF_PACKED_MEMBER}
+CWARNFLAGS+= ${CC_WNO_ADDRESS_OF_PACKED_MEMBER}
.include <bsd.prog.mk>
diff --git a/usr.sbin/makefs/udf/Makefile.inc b/usr.sbin/makefs/udf/Makefile.inc
index ac0dd263029..73d7069336f 100644
--- a/usr.sbin/makefs/udf/Makefile.inc
+++ b/usr.sbin/makefs/udf/Makefile.inc
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.7 2023/06/03 08:53:00 lukem Exp $
+# $NetBSD: Makefile.inc,v 1.8 2023/06/03 21:26:29 lukem Exp $
#
UDF= ${NETBSDSRCDIR}/sys/fs/udf
@@ -16,5 +16,5 @@ DPADD+=${LIBUTIL}
LDADD+=-lutil -lprop
.endif
-CWARNFLAGS.clang+= -Wno-error=address-of-packed-member -Wno-error=constant-conversion
-CWARNFLAGS.gcc+= ${CC_WNO_ADDRESS_OF_PACKED_MEMBER}
+CWARNFLAGS.clang+= -Wno-error=constant-conversion
+CWARNFLAGS+= ${CC_WNO_ADDRESS_OF_PACKED_MEMBER}
diff --git a/usr.sbin/pf/Makefile.inc b/usr.sbin/pf/Makefile.inc
index b3d14a4ee46..d7fb6f67cb4 100644
--- a/usr.sbin/pf/Makefile.inc
+++ b/usr.sbin/pf/Makefile.inc
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile.inc,v 1.12 2023/06/03 08:53:01 lukem Exp $
+# $NetBSD: Makefile.inc,v 1.13 2023/06/03 21:26:29 lukem Exp $
WARNS?= 1 # XXX -Wshadow -Wcast-qual -Wsign-compare
CWARNFLAGS.clang+= -Wno-tautological-compare
-CWARNFLAGS.clang+= -Wno-error=address-of-packed-member
-CWARNFLAGS.gcc+= ${CC_WNO_ADDRESS_OF_PACKED_MEMBER}
+CWARNFLAGS+= ${CC_WNO_ADDRESS_OF_PACKED_MEMBER}
CPPFLAGS+= -D_OPENBSD_SOURCE