Fri Jan 22 21:55:51 2016 UTC ()
Build DTrace userland by default on i386, amd64 and earm*


(riz)
diff -r1.883 -r1.884 src/share/mk/bsd.own.mk
cvs diff -r1.883 -r1.884 src/share/mk/bsd.own.mk (expand / switch to unified diff)

--- src/share/mk/bsd.own.mk 2015/12/19 00:25:50 1.883
+++ src/share/mk/bsd.own.mk 2016/01/22 21:55:51 1.884
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: bsd.own.mk,v 1.883 2015/12/19 00:25:50 wiz Exp $ 1# $NetBSD: bsd.own.mk,v 1.884 2016/01/22 21:55:51 riz Exp $
2 2
3# This needs to be before bsd.init.mk 3# This needs to be before bsd.init.mk
4.if defined(BSD_MK_COMPAT_FILE) 4.if defined(BSD_MK_COMPAT_FILE)
5.include <${BSD_MK_COMPAT_FILE}> 5.include <${BSD_MK_COMPAT_FILE}>
6.endif 6.endif
7 7
8.if !defined(_BSD_OWN_MK_) 8.if !defined(_BSD_OWN_MK_)
9_BSD_OWN_MK_=1 9_BSD_OWN_MK_=1
10 10
11MAKECONF?= /etc/mk.conf 11MAKECONF?= /etc/mk.conf
12.-include "${MAKECONF}" 12.-include "${MAKECONF}"
13 13
14# 14#
@@ -966,26 +966,36 @@ MKSLJIT?= no @@ -966,26 +966,36 @@ MKSLJIT?= no
966# 966#
967.if defined(MKBFD) 967.if defined(MKBFD)
968MKBINUTILS?= ${MKBFD} 968MKBINUTILS?= ${MKBFD}
969.endif 969.endif
970 970
971# 971#
972# We want to build zfs only for amd64 by default for now. 972# We want to build zfs only for amd64 by default for now.
973# 973#
974.if ${MACHINE} == "amd64" 974.if ${MACHINE} == "amd64"
975MKZFS?= yes 975MKZFS?= yes
976.endif 976.endif
977 977
978# 978#
 979# DTrace works on amd64, i386 and earm*
 980#
 981
 982.if ${MACHINE_ARCH} == "i386" || \
 983 ${MACHINE_ARCH} == "x86_64" || \
 984 !empty(MACHINE_ARCH:Mearm*)
 985MKDTRACE?= yes
 986MKCTF?= yes
 987.endif
 988#
979# MK* options which default to "yes". 989# MK* options which default to "yes".
980# 990#
981_MKVARS.yes= \ 991_MKVARS.yes= \
982 MKATF \ 992 MKATF \
983 MKBINUTILS \ 993 MKBINUTILS \
984 MKCRYPTO MKCOMPLEX MKCVS MKCXX \ 994 MKCRYPTO MKCOMPLEX MKCVS MKCXX \
985 MKDOC \ 995 MKDOC \
986 MKGCC MKGDB MKGROFF \ 996 MKGCC MKGDB MKGROFF \
987 MKHESIOD MKHTML \ 997 MKHESIOD MKHTML \
988 MKIEEEFP MKINET6 MKINFO MKIPFILTER MKISCSI \ 998 MKIEEEFP MKINET6 MKINFO MKIPFILTER MKISCSI \
989 MKKERBEROS \ 999 MKKERBEROS \
990 MKKMOD \ 1000 MKKMOD \
991 MKLDAP MKLIBSTDCXX MKLINKLIB MKLVM \ 1001 MKLDAP MKLIBSTDCXX MKLINKLIB MKLVM \