The branch main has been updated by rew:
URL:
https://cgit.FreeBSD.org/src/commit/?id=91f251b2ab3ade5de703756873142bfae2573753
commit 91f251b2ab3ade5de703756873142bfae2573753
Author: Robert Wing <r...@freebsd.org>
AuthorDate: 2021-05-12 02:57:24 +0000
Commit: Robert Wing <r...@freebsd.org>
CommitDate: 2021-05-14 21:00:24 +0000
fstyp(8): define HAVE_ZFS macro when built with zfs
The HAVE_ZFS macro was dropped from the Makefile during the OpenZFS
merge, bring it back.
While here, drop unused WARNS setting.
PR: 255616
Reported by: Michael Büker <free...@michael-bueker.de>
Submitted by: Michael Büker <free...@michael-bueker.de>
Fixes: 9e5787d2284e187abb5b654d924394a65772e004
Reviewed by: markj
MFC after: 1 week
Differential Revision: https://reviews.freebsd.org/D30221
---
usr.sbin/fstyp/Makefile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/usr.sbin/fstyp/Makefile b/usr.sbin/fstyp/Makefile
index bfdc845bba4a..14b5d9dfd9c3 100644
--- a/usr.sbin/fstyp/Makefile
+++ b/usr.sbin/fstyp/Makefile
@@ -28,7 +28,7 @@ SUBDIR.${MK_TESTS}+= tests
.if ${MK_ZFS} != "no"
IGNORE_PRAGMA= YES
-WARNS?= 0
+CFLAGS+= -DHAVE_ZFS
CFLAGS.zfs.c+= -DIN_BASE
CFLAGS.zfs.c+= -I${SRCTOP}/sys/contrib/openzfs/include
CFLAGS.zfs.c+= -I${SRCTOP}/sys/contrib/openzfs/lib/libspl/include
_______________________________________________
dev-commits-src-main@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/dev-commits-src-main
To unsubscribe, send any mail to "dev-commits-src-main-unsubscr...@freebsd.org"
