Module Name:    src
Committed By:   mrg
Date:           Sun Jun 16 19:21:46 UTC 2024

Modified Files:
        src/share/mk: bsd.own.mk

Log Message:
check for MACHINE_ARCH of i386/x86_64 instead of MACHINE i386/amd64.

seems to fix weird xen kernel builds where MACHINE=xen, and it would
not have the GCC-12 only warning flags present.


To generate a diff of this commit:
cvs rdiff -u -r1.1378 -r1.1379 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.1378 src/share/mk/bsd.own.mk:1.1379
--- src/share/mk/bsd.own.mk:1.1378	Sat Jun 15 20:35:14 2024
+++ src/share/mk/bsd.own.mk	Sun Jun 16 19:21:46 2024
@@ -1,4 +1,4 @@
-#	$NetBSD: bsd.own.mk,v 1.1378 2024/06/15 20:35:14 mrg Exp $
+#	$NetBSD: bsd.own.mk,v 1.1379 2024/06/16 19:21:46 mrg Exp $
 
 # This needs to be before bsd.init.mk
 .if defined(BSD_MK_COMPAT_FILE)
@@ -78,8 +78,8 @@ TOOLCHAIN_MISSING?=	no
 .if ${MACHINE_CPU} == "aarch64" || \
     ${MACHINE_CPU} == "riscv" || \
     ${MACHINE_CPU} == "arm" || \
-    ${MACHINE} == "amd64" || \
-    ${MACHINE} == "i386" || \
+    ${MACHINE_ARCH} == "x86_64" || \
+    ${MACHINE_ARCH} == "i386" || \
     ${MACHINE} == "sparc" || \
     ${MACHINE} == "sparc64" || \
     ${MACHINE} == "ia64" || \

Reply via email to