Tue Mar 11 23:22:36 2014 UTC ()
switch amd64 to gcc-4.8


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

--- src/share/mk/bsd.own.mk 2014/03/10 22:38:53 1.783
+++ src/share/mk/bsd.own.mk 2014/03/11 23:22:36 1.784
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: bsd.own.mk,v 1.783 2014/03/10 22:38:53 pooka Exp $ 1# $NetBSD: bsd.own.mk,v 1.784 2014/03/11 23:22:36 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#
@@ -53,27 +53,28 @@ TOOLCHAIN_MISSING?= no @@ -53,27 +53,28 @@ TOOLCHAIN_MISSING?= no
53 53
54# 54#
55# Platforms still using GCC 4.1 55# Platforms still using GCC 4.1
56# 56#
57.if ${MACHINE_CPU} == "vax" 57.if ${MACHINE_CPU} == "vax"
58HAVE_GCC?= 4 58HAVE_GCC?= 4
59 59
60# Platforms switched to GCC 4.8 60# Platforms switched to GCC 4.8
61.elif \ 61.elif \
62 ${MACHINE_CPU} == "alpha" || \ 62 ${MACHINE_CPU} == "alpha" || \
63 ${MACHINE_CPU} == "arm" || \ 63 ${MACHINE_CPU} == "arm" || \
64 ${MACHINE_CPU} == "hppa" || \ 64 ${MACHINE_CPU} == "hppa" || \
65 ${MACHINE_CPU} == "sparc" || \ 65 ${MACHINE_CPU} == "sparc" || \
66 ${MACHINE_CPU} == "sparc64" 66 ${MACHINE_CPU} == "sparc64" || \
 67 ${MACHINE_CPU} == "x86_64"
67HAVE_GCC?= 48 68HAVE_GCC?= 48
68 69
69.else 70.else
70# Otherwise, default to GCC4.5 71# Otherwise, default to GCC4.5
71HAVE_GCC?= 45 72HAVE_GCC?= 45
72.endif 73.endif
73 74
74# 75#
75# We import the old gcc as "gcc.old" when upgrading. EXTERNAL_GCC_SUBDIR is 76# We import the old gcc as "gcc.old" when upgrading. EXTERNAL_GCC_SUBDIR is
76# set to the relevant subdirectory in src/external/gpl3 for his HAVE_GCC. 77# set to the relevant subdirectory in src/external/gpl3 for his HAVE_GCC.
77# 78#
78.if ${HAVE_GCC} == 45 79.if ${HAVE_GCC} == 45
79EXTERNAL_GCC_SUBDIR= gcc.old 80EXTERNAL_GCC_SUBDIR= gcc.old