Use ZFSTOP more broadly
Reviewed by: brooks Obtained from: CheriBSD Differential Revision: https://reviews.freebsd.org/D53791
This commit is contained in:
+7
-7
@@ -53,15 +53,15 @@ LIBADD+= spl
|
||||
LIBADD+= zfsbootenv
|
||||
|
||||
CFLAGS+= -DIN_BASE -DHAVE_RPC_TYPES
|
||||
CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/include
|
||||
CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/include/os/freebsd
|
||||
CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/lib/libspl/include
|
||||
CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/lib/libspl/include/os/freebsd
|
||||
CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/lib/libzfs
|
||||
CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/lib/libzpool/include
|
||||
CFLAGS+= -I${ZFSTOP}/include
|
||||
CFLAGS+= -I${ZFSTOP}/include/os/freebsd
|
||||
CFLAGS+= -I${ZFSTOP}/lib/libspl/include
|
||||
CFLAGS+= -I${ZFSTOP}/lib/libspl/include/os/freebsd
|
||||
CFLAGS+= -I${ZFSTOP}/lib/libzfs
|
||||
CFLAGS+= -I${ZFSTOP}/lib/libzpool/include
|
||||
CFLAGS+= -I${SRCTOP}/sys
|
||||
CFLAGS+= -I${SRCTOP}/cddl/compat/opensolaris/include
|
||||
CFLAGS+= -include ${SRCTOP}/sys/contrib/openzfs/include/os/freebsd/spl/sys/ccompile.h
|
||||
CFLAGS+= -include ${ZFSTOP}/include/os/freebsd/spl/sys/ccompile.h
|
||||
CFLAGS+= -DHAVE_ISSETUGID -DHAVE_STRLCAT -DHAVE_STRLCPY
|
||||
CFLAGS.be.c= -Wno-cast-qual
|
||||
CFLAGS.be_access.c= -Wno-cast-qual
|
||||
|
||||
@@ -14,12 +14,12 @@ LIBADD+= zfs \
|
||||
|
||||
CFLAGS+= -I${SRCTOP}/lib/libbe
|
||||
CFLAGS+= -DIN_BASE -DHAVE_RPC_TYPES
|
||||
CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/include
|
||||
CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/lib/libspl/include/
|
||||
CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/lib/libspl/include/os/freebsd
|
||||
CFLAGS+= -I${ZFSTOP}/include
|
||||
CFLAGS+= -I${ZFSTOP}/lib/libspl/include/
|
||||
CFLAGS+= -I${ZFSTOP}/lib/libspl/include/os/freebsd
|
||||
CFLAGS+= -I${SRCTOP}/sys
|
||||
CFLAGS+= -I${SRCTOP}/cddl/compat/opensolaris/include
|
||||
CFLAGS+= -include ${SRCTOP}/sys/contrib/openzfs/include/os/freebsd/spl/sys/ccompile.h
|
||||
CFLAGS+= -include ${ZFSTOP}/include/os/freebsd/spl/sys/ccompile.h
|
||||
CFLAGS+= -DHAVE_ISSETUGID
|
||||
|
||||
.include <bsd.test.mk>
|
||||
|
||||
@@ -20,10 +20,10 @@ LIBADD+= ctf
|
||||
IGNORE_PRAGMA= YES
|
||||
CFLAGS+= -DIN_BASE
|
||||
CFLAGS+= -DSKIP_SPL_SYS_CONDVAR_H
|
||||
CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/include
|
||||
CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/lib/libspl/include/
|
||||
CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/lib/libspl/include/os/freebsd
|
||||
CFLAGS+= -include ${SRCTOP}/sys/contrib/openzfs/include/os/freebsd/spl/sys/ccompile.h
|
||||
CFLAGS+= -I${ZFSTOP}/include
|
||||
CFLAGS+= -I${ZFSTOP}/lib/libspl/include/
|
||||
CFLAGS+= -I${ZFSTOP}/lib/libspl/include/os/freebsd
|
||||
CFLAGS+= -include ${ZFSTOP}/include/os/freebsd/spl/sys/ccompile.h
|
||||
CFLAGS+= -DHAVE_ISSETUGID -DHAVE_BOOLEAN -DHAVE_STRLCAT -DHAVE_STRLCPY
|
||||
CFLAGS+= -I${SRCTOP}/cddl/contrib/opensolaris/lib/libctf/common \
|
||||
-I${SRCTOP}/sys/cddl/contrib/opensolaris/uts/common \
|
||||
|
||||
@@ -55,7 +55,6 @@ MLINKS+=libprocstat.3 procstat_close.3 \
|
||||
.if ${MK_CDDL} != "no"
|
||||
CFLAGS+= -DLIBPROCSTAT_ZFS
|
||||
SRCS+= zfs.c
|
||||
ZFSTOP= ${SRCTOP}/sys/contrib/openzfs
|
||||
CFLAGS.zfs.c+= -DIN_BASE
|
||||
CFLAGS.zfs.c+= -DHAVE_ISSETUGID
|
||||
CFLAGS.zfs.c+= -DZFS_DEBUG
|
||||
|
||||
Reference in New Issue
Block a user