Module Name: src
Committed By: mrg
Date: Sat Mar 13 19:31:52 UTC 2010
Modified Files:
src/share/mk: bsd.own.mk
Log Message:
revert the previous:
- the default for ZFS on x86 already was "yes".
- this left MKZFS unset for other platforms, which breaks the build.
To generate a diff of this commit:
cvs rdiff -u -r1.622 -r1.623 src/share/mk/bsd.own.mk
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/share/mk/bsd.own.mk
diff -u src/share/mk/bsd.own.mk:1.622 src/share/mk/bsd.own.mk:1.623
--- src/share/mk/bsd.own.mk:1.622 Sat Mar 13 17:07:28 2010
+++ src/share/mk/bsd.own.mk Sat Mar 13 19:31:51 2010
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.own.mk,v 1.622 2010/03/13 17:07:28 haad Exp $
+# $NetBSD: bsd.own.mk,v 1.623 2010/03/13 19:31:51 mrg Exp $
# This needs to be before bsd.init.mk
.if defined(BSD_MK_COMPAT_FILE)
@@ -717,7 +717,8 @@
.endif
#
-# MK* options which default to "no".
+# MK* options which default to "no". Note that MKZFS has a different
+# default for some platforms, see above.
#
_MKVARS.no= \
MKCRYPTO_IDEA MKCRYPTO_MDC2 MKCRYPTO_RC5 MKDEBUG MKDEBUGLIB \
@@ -725,7 +726,7 @@
MKMANDOC MKMANZ MKOBJDIRS \
MKPCC MKPCCCMDS \
MKSOFTFLOAT MKSTRIPIDENT \
- MKUNPRIVED MKUPDATE MKX11
+ MKUNPRIVED MKUPDATE MKX11 MKZFS
.for var in ${_MKVARS.no}
${var}?=no
.endfor
