summaryrefslogtreecommitdiffstats
path: root/sys/conf/kern.opts.mk
diff options
context:
space:
mode:
Diffstat (limited to 'sys/conf/kern.opts.mk')
-rw-r--r--sys/conf/kern.opts.mk10
1 files changed, 1 insertions, 9 deletions
diff --git a/sys/conf/kern.opts.mk b/sys/conf/kern.opts.mk
index d1d2d04..ad6ee72 100644
--- a/sys/conf/kern.opts.mk
+++ b/sys/conf/kern.opts.mk
@@ -30,7 +30,6 @@ __DEFAULT_YES_OPTIONS = \
CDDL \
CRYPT \
CUSE \
- FAST_DEPEND \
FORMAT_EXTENSIONS \
INET \
INET6 \
@@ -49,12 +48,6 @@ __DEFAULT_NO_OPTIONS = \
NAND \
OFED
-# Enable FAST_DEPEND by default for the meta build.
-.if !empty(.MAKE.MODE:Unormal:Mmeta)
-__DEFAULT_YES_OPTIONS+= FAST_DEPEND
-__DEFAULT_NO_OPTIONS:= ${__DEFAULT_NO_OPTIONS:NFAST_DEPEND}
-.endif
-
# Some options are totally broken on some architectures. We disable
# them. If you need to enable them on an experimental basis, you
# must change this code.
@@ -65,9 +58,8 @@ __DEFAULT_NO_OPTIONS:= ${__DEFAULT_NO_OPTIONS:NFAST_DEPEND}
# Things that don't work based on the CPU
.if ${MACHINE_CPUARCH} == "arm"
-BROKEN_OPTIONS+= ZFS
. if ${MACHINE_ARCH:Marmv6*} == ""
-BROKEN_OPTIONS+= CDDL
+BROKEN_OPTIONS+= CDDL ZFS
. endif
.endif
OpenPOWER on IntegriCloud