summaryrefslogtreecommitdiff
path: root/external
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 /external
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 'external')
-rw-r--r--external/apache2/mDNSResponder/usr.sbin/mdnsd/Makefile6
-rw-r--r--external/bsd/ipf/Makefile.inc7
-rw-r--r--external/bsd/tcpdump/bin/Makefile5
3 files changed, 8 insertions, 10 deletions
diff --git a/external/apache2/mDNSResponder/usr.sbin/mdnsd/Makefile b/external/apache2/mDNSResponder/usr.sbin/mdnsd/Makefile
index 511b23e3f9f..e50f79040e5 100644
--- a/external/apache2/mDNSResponder/usr.sbin/mdnsd/Makefile
+++ b/external/apache2/mDNSResponder/usr.sbin/mdnsd/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2023/06/03 09:09:02 lukem Exp $
+# $NetBSD: Makefile,v 1.17 2023/06/03 21:26:27 lukem Exp $
PROG= mdnsd
@@ -17,8 +17,8 @@ COPTS.uds_daemon.c += -Wno-stack-protector
MAN= mdnsd.8
-CWARNFLAGS.clang+= -Wno-unused-value -Wno-error=address-of-packed-member
-CWARNFLAGS.gcc+= ${CC_WNO_ADDRESS_OF_PACKED_MEMBER}
+CWARNFLAGS.clang+= -Wno-unused-value
+CWARNFLAGS+= ${CC_WNO_ADDRESS_OF_PACKED_MEMBER}
COPTS.DNSCommon.c+= ${CC_WNO_RETURN_LOCAL_ADDR}
diff --git a/external/bsd/ipf/Makefile.inc b/external/bsd/ipf/Makefile.inc
index f846c3765bd..d14b6a7f86a 100644
--- a/external/bsd/ipf/Makefile.inc
+++ b/external/bsd/ipf/Makefile.inc
@@ -1,11 +1,10 @@
-# $NetBSD: Makefile.inc,v 1.8 2023/06/03 09:09:03 lukem Exp $
+# $NetBSD: Makefile.inc,v 1.9 2023/06/03 21:26:27 lukem Exp $
WARNS?= 1 # XXX -Wcast-qual -Wshadow
CWARNFLAGS.clang+= -Wno-format -Wno-tautological-compare \
-Wno-self-assign -Wno-array-bounds \
- -Wno-error=unused-const-variable \
- -Wno-error=address-of-packed-member
-CWARNFLAGS.gcc+= ${CC_WNO_ADDRESS_OF_PACKED_MEMBER}
+ -Wno-error=unused-const-variable
+CWARNFLAGS+= ${CC_WNO_ADDRESS_OF_PACKED_MEMBER}
.include <bsd.own.mk>
diff --git a/external/bsd/tcpdump/bin/Makefile b/external/bsd/tcpdump/bin/Makefile
index d82f0d2b61b..afeaeb657fd 100644
--- a/external/bsd/tcpdump/bin/Makefile
+++ b/external/bsd/tcpdump/bin/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.24 2023/06/03 09:09:05 lukem Exp $
+# $NetBSD: Makefile,v 1.25 2023/06/03 21:26:27 lukem Exp $
WARNS?= 1 # XXX: need to cleanup later
@@ -205,8 +205,7 @@ tcpdump.8: tcpdump.1.in
@rm -f ${.TARGET}
cp ${.ALLSRC} ${.TARGET}
-CWARNFLAGS.clang+= -Wno-error=address-of-packed-member
-CWARNFLAGS.gcc+= ${CC_WNO_ADDRESS_OF_PACKED_MEMBER}
+CWARNFLAGS+= ${CC_WNO_ADDRESS_OF_PACKED_MEMBER}
COPTS.print-bgp.c+= ${CC_WNO_FORMAT_TRUNCATION}
COPTS.signature.c+= -Wno-error=deprecated-declarations
COPTS.print-tcp.c+= -Wno-error=deprecated-declarations