Sun Apr 3 06:13:28 2016 UTC ()
switch amd64 and i386 to GCC 5.3 by default.


(mrg)
diff -r1.916 -r1.917 src/share/mk/bsd.own.mk
cvs diff -r1.916 -r1.917 src/share/mk/bsd.own.mk (expand / switch to unified diff)

--- src/share/mk/bsd.own.mk 2016/04/02 22:08:14 1.916
+++ src/share/mk/bsd.own.mk 2016/04/03 06:13:28 1.917
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: bsd.own.mk,v 1.916 2016/04/02 22:08:14 mrg Exp $ 1# $NetBSD: bsd.own.mk,v 1.917 2016/04/03 06:13:28 mrg 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#
@@ -57,28 +57,30 @@ MKGCC?= no @@ -57,28 +57,30 @@ MKGCC?= no
57.endif 57.endif
58 58
59# 59#
60# GCC Using platforms. 60# GCC Using platforms.
61# 61#
62.if ${MKGCC:Uyes} != "no" 62.if ${MKGCC:Uyes} != "no"
63 63
64# 64#
65# What GCC is used? 65# What GCC is used?
66# 66#
67.if ${MACHINE_CPU} == "aarch64" 67.if ${MACHINE_CPU} == "aarch64"
68HAVE_GCC?= 0 68HAVE_GCC?= 0
69.elif \ 69.elif \
 70 ${MACHINE} == "amd64" || \
70 ${MACHINE} == "alpha" || \ 71 ${MACHINE} == "alpha" || \
71 ${MACHINE} == "hppa" || \ 72 ${MACHINE} == "hppa" || \
 73 ${MACHINE} == "i386" || \
72 ${MACHINE} == "playstation2" || \ 74 ${MACHINE} == "playstation2" || \
73 ${MACHINE_ARCH} == "vax" 75 ${MACHINE_ARCH} == "vax"
74HAVE_GCC?= 53 76HAVE_GCC?= 53
75.else 77.else
76# Otherwise, default to GCC4.8 78# Otherwise, default to GCC4.8
77HAVE_GCC?= 48 79HAVE_GCC?= 48
78.endif 80.endif
79 81
80# 82#
81# Platforms that can't run a modern GCC natively 83# Platforms that can't run a modern GCC natively
82.if ${MACHINE_ARCH} == "m68000" 84.if ${MACHINE_ARCH} == "m68000"
83MKGCCCMDS?= no 85MKGCCCMDS?= no
84.endif 86.endif