git: 1a1f7b7df7dd - main - zlib: Add proper NO_WSTRICT_PROTYPES too

The branch main has been updated by imp:

URL: https://cgit.FreeBSD.org/src/commit/?id=1a1f7b7df7dd7c0638b6425dab4d1aea06441168

commit 1a1f7b7df7dd7c0638b6425dab4d1aea06441168
Author:     Warner Losh <imp@FreeBSD.org>
AuthorDate: 2023-02-13 19:00:50 +0000
Commit:     Warner Losh <imp@FreeBSD.org>
CommitDate: 2023-02-13 19:50:56 +0000

    zlib: Add proper NO_WSTRICT_PROTYPES too
    
    Also move NO_WDEPRECATED_NON_PROTOTYPE to a better place...
    
    Sponsored by:   Netflix
    Noticed by:     jhb
    Fixes:          b9f235ba3178
---
 sys/conf/kern.mk     | 2 +-
 sys/conf/kern.pre.mk | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/sys/conf/kern.mk b/sys/conf/kern.mk
index 2668b7e5296e..74c47479ab9e 100644
--- a/sys/conf/kern.mk
+++ b/sys/conf/kern.mk
@@ -36,6 +36,7 @@ NO_WBITWISE_INSTEAD_OF_LOGICAL=	-Wno-bitwise-instead-of-logical
 .endif
 .if ${COMPILER_VERSION} >= 150000
 NO_WSTRICT_PROTOTYPES=		-Wno-strict-prototypes
+NO_WDEPRECATED_NON_PROTOTYPE=	-Wno-deprecated-non-prototype
 .endif
 # Several other warnings which might be useful in some cases, but not severe
 # enough to error out the whole kernel build.  Display them anyway, so there is
@@ -53,7 +54,6 @@ CWARNEXTRA+=	-Wno-error=array-parameter
 CWARNEXTRA+=	-Wno-error=deprecated-non-prototype
 CWARNEXTRA+=	-Wno-error=strict-prototypes
 CWARNEXTRA+=	-Wno-error=unused-but-set-variable
-NO_WDEPRECATED_NON_PROTOTYPE=-Wno-deprecated-non-prototype
 .endif
 .endif	# clang
 
diff --git a/sys/conf/kern.pre.mk b/sys/conf/kern.pre.mk
index 1a94709eaded..e347f9fb9903 100644
--- a/sys/conf/kern.pre.mk
+++ b/sys/conf/kern.pre.mk
@@ -280,7 +280,7 @@ DTRACE_S=	${CC} -c ${DTRACE_ASM_CFLAGS}	${WERROR} ${.IMPSRC}
 
 # zlib code supports systems that are quite old, but will fix this issue once C2x gets radified.
 # see https://github.com/madler/zlib/issues/633 for details
-ZLIB_CFLAGS=	-Wno-cast-qual ${NO_WDEPRECATED_NON_PROTOTYPE} -Wno-strict-prototypes
+ZLIB_CFLAGS=	-Wno-cast-qual ${NO_WDEPRECATED_NON_PROTOTYPE} ${NO_WSTRICT_PROTOTYPES}
 ZLIB_C=		${CC} -c ${CFLAGS} ${WERROR} ${ZLIB_CFLAGS} ${.IMPSRC}
 
 # Special flags for managing the compat compiles for DTrace/FBT