From 91f251b2ab3ade5de703756873142bfae2573753 Mon Sep 17 00:00:00 2001 From: Robert Wing Date: Tue, 11 May 2021 18:57:24 -0800 Subject: [PATCH] fstyp(8): define HAVE_ZFS macro when built with zfs MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 Submitted by: Michael Büker 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