From cc61ab2f133566dca51970d44cc49a4355039b5d Mon Sep 17 00:00:00 2001
From: mm <mm@FreeBSD.org>
Date: Mon, 11 Jun 2012 11:35:22 +0000
Subject: Introduce "feature flags" for ZFS pools (bump SPA version to 5000).
 Add first feature "com.delphix:async_destroy" (asynchronous destroy of ZFS
 datasets). Implement features support in ZFS boot code.

Illumos revisions merged:
13700:2889e2596bd6
13701:1949b688d5fb
2619 asynchronous destruction of ZFS file systems
2747 SPA versioning with zfs feature flags

References:
https://www.illumos.org/issues/2619
https://www.illumos.org/issues/2747

Obtained from:	illumos (issue #2619, #2747)
MFC after:	1 month
---
 cddl/usr.sbin/Makefile | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'cddl/usr.sbin/Makefile')

diff --git a/cddl/usr.sbin/Makefile b/cddl/usr.sbin/Makefile
index a84715b..42d124f 100644
--- a/cddl/usr.sbin/Makefile
+++ b/cddl/usr.sbin/Makefile
@@ -5,11 +5,13 @@
 SUBDIR=	${_dtrace} \
 	${_dtruss} \
 	${_lockstat} \
-	${_zdb}
+	${_zdb} \
+	${_zhack}
 
 .if ${MK_ZFS} != "no"
 .if ${MK_LIBTHR} != "no"
 _zdb=	zdb
+_zhack=	zhack
 .endif
 .endif
 
-- 
cgit v1.1