aboutsummaryrefslogtreecommitdiff
path: root/share
diff options
context:
space:
mode:
authorMatt Macy <mmacy@FreeBSD.org>2019-01-05 22:45:20 +0000
committerMatt Macy <mmacy@FreeBSD.org>2019-01-05 22:45:20 +0000
commitfbeb31a26b2571d6df5b035246e2f9094fd0bc4c (patch)
tree8d905750e8e551df02e35fc088787c20249c6566 /share
parentac102a2a633cdc014a4ffd8f323c004b862fd439 (diff)
downloadsrc-fbeb31a26b2571d6df5b035246e2f9094fd0bc4c.tar.gz
src-fbeb31a26b2571d6df5b035246e2f9094fd0bc4c.zip
MK_ZFS -> {MK_ZFS|MK_LOADER_ZFS}, this is so we can diable userland / kernel
ZFS but keep the boot-loaders when using ZoL port. MFC after: 1 week Reviewed by: rgrimes Differential Revision: https://reviews.freebsd.org/D18739
Notes
Notes: svn path=/head/; revision=342793
Diffstat (limited to 'share')
-rw-r--r--share/mk/src.opts.mk2
1 files changed, 2 insertions, 0 deletions
diff --git a/share/mk/src.opts.mk b/share/mk/src.opts.mk
index f5c27cf141ea..54fcdff9d83f 100644
--- a/share/mk/src.opts.mk
+++ b/share/mk/src.opts.mk
@@ -191,6 +191,7 @@ __DEFAULT_YES_OPTIONS = \
WIRELESS \
WPA_SUPPLICANT_EAPOL \
ZFS \
+ LOADER_ZFS \
ZONEINFO
__DEFAULT_NO_OPTIONS = \
@@ -451,6 +452,7 @@ MK_SOURCELESS_UCODE:= no
.if ${MK_CDDL} == "no"
MK_ZFS:= no
+MK_LOADER_ZFS:= no
MK_CTF:= no
.endif