summaryrefslogtreecommitdiff
path: root/crypto
diff options
context:
space:
mode:
authorlukem <lukem@NetBSD.org>2023-06-03 21:30:20 +0000
committerlukem <lukem@NetBSD.org>2023-06-03 21:30:20 +0000
commitbf78d24f392cabe409a8996d69a3aa31cfa05bf5 (patch)
tree2918bee2f5c43e69cf1466373a63dce5c843ba82 /crypto
parente0afa30fb1d93c0343ecc354a6d6f67358e262cd (diff)
adapt to ${CC_WNO_IMPLICIT_FALLTHROUGH}
Use ${CC_WNO_IMPLICIT_FALLTHROUGH} instead of the older style more complex expressions.
Diffstat (limited to 'crypto')
-rw-r--r--crypto/external/bsd/netpgp/bin/netpgpverify/Makefile6
-rw-r--r--crypto/external/bsd/netpgp/lib/verify/Makefile4
-rw-r--r--crypto/external/bsd/openssh/bin/sftp/Makefile6
3 files changed, 6 insertions, 10 deletions
diff --git a/crypto/external/bsd/netpgp/bin/netpgpverify/Makefile b/crypto/external/bsd/netpgp/bin/netpgpverify/Makefile
index c17cff042d1..025c200111e 100644
--- a/crypto/external/bsd/netpgp/bin/netpgpverify/Makefile
+++ b/crypto/external/bsd/netpgp/bin/netpgpverify/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2023/06/03 09:09:01 lukem Exp $
+# $NetBSD: Makefile,v 1.21 2023/06/03 21:30:20 lukem Exp $
PROG=netpgpverify
BINDIR= /usr/bin
@@ -32,9 +32,7 @@ EXTDIST=${.CURDIR}/../../dist
.include <bsd.own.mk>
-.if defined(HAVE_GCC) && ${HAVE_GCC} >= 7 && ${ACTIVE_CC} == "gcc"
-COPTS+= -Wno-error=implicit-fallthrough
-.endif
+COPTS+= ${CC_WNO_IMPLICIT_FALLTHROUGH}
COPTS.libverify.c+= ${CC_WNO_FORMAT_TRUNCATION}
diff --git a/crypto/external/bsd/netpgp/lib/verify/Makefile b/crypto/external/bsd/netpgp/lib/verify/Makefile
index 18c5dc2d04c..6ef516e0b7d 100644
--- a/crypto/external/bsd/netpgp/lib/verify/Makefile
+++ b/crypto/external/bsd/netpgp/lib/verify/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2023/06/03 09:09:01 lukem Exp $
+# $NetBSD: Makefile,v 1.16 2023/06/03 21:30:20 lukem Exp $
LIB=netpgpverify
SRCS+=b64.c
@@ -27,7 +27,7 @@ INCSDIR=/usr/include/netpgp
.include <bsd.own.mk>
-COPTS+= ${${ACTIVE_CC} == "gcc":? -Wno-implicit-fallthrough :}
+COPTS+= ${CC_WNO_IMPLICIT_FALLTHROUGH}
COPTS.libverify.c+= ${CC_WNO_FORMAT_TRUNCATION}
LINTFLAGS.bzlib.c+= -X 161 # constant in conditional context
diff --git a/crypto/external/bsd/openssh/bin/sftp/Makefile b/crypto/external/bsd/openssh/bin/sftp/Makefile
index 752f632dbd2..76a02496ebe 100644
--- a/crypto/external/bsd/openssh/bin/sftp/Makefile
+++ b/crypto/external/bsd/openssh/bin/sftp/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2022/10/05 22:39:36 christos Exp $
+# $NetBSD: Makefile,v 1.11 2023/06/03 21:30:20 lukem Exp $
BINDIR= /usr/bin
@@ -14,8 +14,6 @@ COPTS.sftp-client.c+= -Wno-pointer-sign
.include <bsd.own.mk>
-.if defined(HAVE_GCC) && ${HAVE_GCC} >= 7 && ${ACTIVE_CC} == "gcc"
-COPTS.sftp.c+= -Wno-error=implicit-fallthrough
-.endif
+COPTS.sftp.c+= ${CC_WNO_IMPLICIT_FALLTHROUGH}
.include <bsd.prog.mk>