git: 701e4b36b451 - main - zfs: Reuse ZINCDIR variable from kmod.mk
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Tue, 09 Dec 2025 16:00:33 UTC
The branch main has been updated by jhb:
URL: https://cgit.FreeBSD.org/src/commit/?id=701e4b36b4510c8cf26155ec3ab5aca9b7ba9406
commit 701e4b36b4510c8cf26155ec3ab5aca9b7ba9406
Author: John Baldwin <jhb@FreeBSD.org>
AuthorDate: 2025-12-09 16:00:20 +0000
Commit: John Baldwin <jhb@FreeBSD.org>
CommitDate: 2025-12-09 16:00:20 +0000
zfs: Reuse ZINCDIR variable from kmod.mk
Reviewed by: brooks, imp
Differential Revision: https://reviews.freebsd.org/D54147
---
sys/modules/zfs/Makefile | 11 +++++------
1 file changed, 5 insertions(+), 6 deletions(-)
diff --git a/sys/modules/zfs/Makefile b/sys/modules/zfs/Makefile
index 7a4d0bb51376..2751bb465258 100644
--- a/sys/modules/zfs/Makefile
+++ b/sys/modules/zfs/Makefile
@@ -1,5 +1,4 @@
SRCDIR=${SRCTOP}/sys/contrib/openzfs/module
-INCDIR=${SRCTOP}/sys/contrib/openzfs/include
KMOD= zfs
@@ -27,11 +26,11 @@ KMOD= zfs
${SRCDIR}/zstd/lib/compress \
${SRCDIR}/zstd/lib/decompress
-CFLAGS+= -I${INCDIR}
+CFLAGS+= -I${ZINCDIR}
CFLAGS+= -I${SRCDIR}/icp/include
-CFLAGS+= -I${INCDIR}/os/freebsd
-CFLAGS+= -I${INCDIR}/os/freebsd/spl
-CFLAGS+= -I${INCDIR}/os/freebsd/zfs
+CFLAGS+= -I${ZINCDIR}/os/freebsd
+CFLAGS+= -I${ZINCDIR}/os/freebsd/spl
+CFLAGS+= -I${ZINCDIR}/os/freebsd/zfs
CFLAGS+= -I${SRCDIR}/zstd/include
CFLAGS+= -I${.CURDIR}
@@ -388,7 +387,7 @@ SRCS+= zfs_zstd.c \
.include <bsd.kmod.mk>
CFLAGS+= -include ${SRCTOP}/sys/cddl/compat/opensolaris/sys/debug_compat.h
-CFLAGS+= -include ${INCDIR}/os/freebsd/spl/sys/ccompile.h
+CFLAGS+= -include ${ZINCDIR}/os/freebsd/spl/sys/ccompile.h
CFLAGS+= -include ${SRCTOP}/sys/modules/zfs/static_ccompile.h
CFLAGS.sysctl_os.c= -include ${SRCTOP}/sys/modules/zfs/zfs_config.h