Module Name: src
Committed By: riastradh
Date: Fri Jul 21 20:03:13 UTC 2023
Modified Files:
src/share/mk: bsd.own.mk
Log Message:
bsd.own.mk: Use MACHINE_ARCH for default MKCTF/MKDTRACE=yes x86.
The substantive impact of this is that it enables MKCTF=yes for Xen
kernels. This is a change because, when building a Xen kernel
(XEN3_DOM0, XEN3_DOMU), MACHINE is set to `xen', not to `i386' or
`amd64', so the conditional never took effect.
(The side effect of setting MKDTRACE=yes when building Xen kernels is
unlikely to matter; that affects module and userland builds.)
PR port-xen/57535
XXX pullup-10
To generate a diff of this commit:
cvs rdiff -u -r1.1342 -r1.1343 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.1342 src/share/mk/bsd.own.mk:1.1343
--- src/share/mk/bsd.own.mk:1.1342 Sat Jun 10 16:08:41 2023
+++ src/share/mk/bsd.own.mk Fri Jul 21 20:03:13 2023
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.own.mk,v 1.1342 2023/06/10 16:08:41 lukem Exp $
+# $NetBSD: bsd.own.mk,v 1.1343 2023/07/21 20:03:13 riastradh Exp $
# This needs to be before bsd.init.mk
.if defined(BSD_MK_COMPAT_FILE)
@@ -1117,8 +1117,8 @@ MKZFS?= yes
#
# DTrace works on amd64, i386, aarch64, and earm*
#
-.if ${MACHINE} == "i386" || \
- ${MACHINE} == "amd64" || \
+.if ${MACHINE_ARCH} == "i386" || \
+ ${MACHINE_ARCH} == "x86_64" || \
${MACHINE_ARCH} == "aarch64" || \
${MACHINE_ARCH:Mearm*}
MKDTRACE?= yes
