git: 1ee339e257b3 - openzfs: fix gcc in-kernel builds

[Ryan Libby]

The branch main has been updated by rlibby:

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

commit 1ee339e257b39cdfad7995f98336e3cd0edbc9a5
Author:     Ryan Libby <rlibby at FreeBSD.org>
AuthorDate: 2020-12-24 20:34:18 +0000
Commit:     Ryan Libby <rlibby at FreeBSD.org>
CommitDate: 2020-12-24 20:34:18 +0000

    openzfs: fix gcc in-kernel builds
    
    Fix gcc builds of in-kernel modules using CDDL_CFLAGS (e.g. options
    ZFS).
    
     - Remove nonexistent include dirs for -Wmissing-include-dirs
     - Suppress -Wnested-externs, a useless warning
     - Sort and uniq warning flags while here
    
    Reviewed by:    markj
    Sponsored by:   Dell EMC Isilon
    Differential Revision:  https://reviews.freebsd.org/D27684
---
 sys/conf/kern.pre.mk | 22 ++++++++++------------
 1 file changed, 10 insertions(+), 12 deletions(-)

diff --git a/sys/conf/kern.pre.mk b/sys/conf/kern.pre.mk
index cb1703097836..4a0663f49753 100644
--- a/sys/conf/kern.pre.mk
+++ b/sys/conf/kern.pre.mk
@@ -209,29 +209,27 @@ CDDL_CFLAGS=	\
 	-nostdinc \
 	-include $S/modules/zfs/static_ccompile.h \
 	-I${ZINCDIR} \
-	-I${ZINCDIR}/spl \
 	-I${ZINCDIR}/os/freebsd \
 	-I${ZINCDIR}/os/freebsd/spl \
 	-I${ZINCDIR}/os/freebsd/zfs  \
 	-I$S/modules/zfs \
 	-I$S/contrib/openzfs/module/zstd/include \
-	-I$S/contrib/openzfs/module/zstd/lib/freebsd/ \
 	${CFLAGS} \
-	-Wno-unknown-pragmas \
-	-Wno-missing-prototypes \
-	-Wno-undef \
-	-Wno-strict-prototypes \
 	-Wno-cast-qual \
+	-Wno-duplicate-decl-specifier \
+	-Wno-inline \
+	-Wno-missing-braces \
+	-Wno-missing-prototypes \
+	-Wno-nested-externs \
 	-Wno-parentheses \
+	-Wno-pointer-arith \
 	-Wno-redundant-decls \
-	-Wno-missing-braces \
-	-Wno-uninitialized \
-	-Wno-unused \
-	-Wno-inline \
+	-Wno-strict-prototypes \
 	-Wno-switch \
-	-Wno-pointer-arith \
+	-Wno-undef \
+	-Wno-uninitialized \
 	-Wno-unknown-pragmas \
-	-Wno-duplicate-decl-specifier \
+	-Wno-unused \
 	-include ${ZINCDIR}/os/freebsd/spl/sys/ccompile.h \
 	-I$S/cddl/contrib/opensolaris/uts/common \
 	-I$S -I$S/cddl/compat/opensolaris