The branch stable/13 has been updated by mav: URL: https://cgit.FreeBSD.org/src/commit/?id=0cb06bcc54d9c05b72886b5729cf0593c2d703c5
commit 0cb06bcc54d9c05b72886b5729cf0593c2d703c5 Author: Alexander Motin <[email protected]> AuthorDate: 2021-03-15 17:48:50 +0000 Commit: Alexander Motin <[email protected]> CommitDate: 2021-03-22 00:54:06 +0000 Include ccompile.h after opt_global.h. This restores INVARIANTS enabling ZFS_DEBUG when built as module. Discussed with: freqlabs MFC after: 1 week (cherry picked from commit 8ea35c45d5206ad57945ba160484f04450c88b75) --- sys/modules/zfs/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/modules/zfs/Makefile b/sys/modules/zfs/Makefile index 0fab9f552314..983f0aa0e994 100644 --- a/sys/modules/zfs/Makefile +++ b/sys/modules/zfs/Makefile @@ -22,8 +22,6 @@ CFLAGS+= -I${INCDIR}/os/freebsd CFLAGS+= -I${INCDIR}/os/freebsd/spl CFLAGS+= -I${INCDIR}/os/freebsd/zfs CFLAGS+= -I${SRCDIR}/zstd/include -CFLAGS+= -include ${INCDIR}/os/freebsd/spl/sys/ccompile.h -CFLAGS+= -include ${SRCTOP}/sys/modules/zfs/static_ccompile.h CFLAGS+= -I${.CURDIR} CFLAGS+= -D__KERNEL__ -DFREEBSD_NAMECACHE -DBUILDING_ZFS \ @@ -284,6 +282,8 @@ 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 ${SRCTOP}/sys/modules/zfs/static_ccompile.h CWARNFLAGS+= ${OPENZFS_CWARNFLAGS} _______________________________________________ [email protected] mailing list https://lists.freebsd.org/mailman/listinfo/dev-commits-src-all To unsubscribe, send any mail to "[email protected]"
