Page Menu
Home
FreeBSD
Search
Configure Global Search
Log In
Files
F148943557
D54147.1789234616.diff
No One
Temporary
Actions
View File
Edit File
Delete File
View Transforms
Subscribe
Flag For Later
Award Token
Size
1 KB
Referenced Files
None
Subscribers
None
D54147.1789234616.diff
View Options
diff --git a/sys/modules/zfs/Makefile b/sys/modules/zfs/Makefile
--- 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 @@
${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 @@
.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
File Metadata
Details
Attached
Mime Type
text/plain
Expires
Sat, Sep 12, 5:36 PM (5 h, 42 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
29561633
Default Alt Text
D54147.1789234616.diff (1 KB)
Attached To
Mode
D54147: zfs: Reuse ZINCDIR variable from kmod.mk
Attached
Detach File
Event Timeline
Log In to Comment