Thu May 27 17:41:28 2021 UTC ()
switch to MACHINE_ARCH i386 to include xen (thanks mlelstv)


(christos)
diff -r1.1251 -r1.1252 src/share/mk/bsd.own.mk
cvs diff -r1.1251 -r1.1252 src/share/mk/bsd.own.mk (expand / switch to unified diff)

--- src/share/mk/bsd.own.mk 2021/05/27 17:13:20 1.1251
+++ src/share/mk/bsd.own.mk 2021/05/27 17:41:28 1.1252
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: bsd.own.mk,v 1.1251 2021/05/27 17:13:20 christos Exp $ 1# $NetBSD: bsd.own.mk,v 1.1252 2021/05/27 17:41:28 christos 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#
@@ -64,32 +64,31 @@ NEED_OWN_INSTALL_TARGET?= yes @@ -64,32 +64,31 @@ NEED_OWN_INSTALL_TARGET?= yes
64 64
65TOOLCHAIN_MISSING?= no 65TOOLCHAIN_MISSING?= no
66 66
67# 67#
68# GCC Using platforms. 68# GCC Using platforms.
69# 69#
70.if ${MKGCC:Uyes} != "no" 70.if ${MKGCC:Uyes} != "no"
71 71
72# 72#
73# What GCC is used? 73# What GCC is used?
74# 74#
75.if ${MACHINE} == "alpha" || \ 75.if ${MACHINE} == "alpha" || \
76 ${MACHINE} == "hppa" || \ 76 ${MACHINE} == "hppa" || \
77 ${MACHINE} == "i386" || \ 
78 ${MACHINE} == "xen" || \ 
79 ${MACHINE} == "ia64" || \ 77 ${MACHINE} == "ia64" || \
80 ${MACHINE} == "sparc" || \ 78 ${MACHINE} == "sparc" || \
81 ${MACHINE} == "sparc64" || \ 79 ${MACHINE} == "sparc64" || \
82 ${MACHINE} == "vax" || \ 80 ${MACHINE} == "vax" || \
 81 ${MACHINE_ARCH} == "i386" || \
83 ${MACHINE_ARCH} == "x86_64" || \ 82 ${MACHINE_ARCH} == "x86_64" || \
84 ${MACHINE_CPU} == "aarch64" || \ 83 ${MACHINE_CPU} == "aarch64" || \
85 ${MACHINE_CPU} == "mips" || \ 84 ${MACHINE_CPU} == "mips" || \
86 ${MACHINE_CPU} == "powerpc" || \ 85 ${MACHINE_CPU} == "powerpc" || \
87 ${MACHINE_CPU} == "riscv" 86 ${MACHINE_CPU} == "riscv"
88HAVE_GCC?= 10 87HAVE_GCC?= 10
89.else 88.else
90HAVE_GCC?= 9 89HAVE_GCC?= 9
91.endif 90.endif
92 91
93# 92#
94# Platforms that can't run a modern GCC natively 93# Platforms that can't run a modern GCC natively
95.if ${MACHINE_ARCH} == "m68000" 94.if ${MACHINE_ARCH} == "m68000"