Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/share/mk bsd.own.mk: Use MACHINE_ARCH for default MKCTF/MKDT...



details:   https://anonhg.NetBSD.org/src/rev/99f8623f3cc7
branches:  trunk
changeset: 378133:99f8623f3cc7
user:      riastradh <riastradh%NetBSD.org@localhost>
date:      Fri Jul 21 20:03:13 2023 +0000

description:
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

diffstat:

 share/mk/bsd.own.mk |  6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diffs (20 lines):

diff -r 21f9bfe874d4 -r 99f8623f3cc7 share/mk/bsd.own.mk
--- a/share/mk/bsd.own.mk       Fri Jul 21 15:00:32 2023 +0000
+++ b/share/mk/bsd.own.mk       Fri Jul 21 20:03:13 2023 +0000
@@ -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



Home | Main Index | Thread Index | Old Index