Fri Sep 25 08:24:20 2015 UTC ()
move GCC 4.8 users to using gcc.old.  should be no functional change.


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

--- src/share/mk/bsd.own.mk 2015/08/17 17:36:06 1.872
+++ src/share/mk/bsd.own.mk 2015/09/25 08:24:20 1.873
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: bsd.own.mk,v 1.872 2015/08/17 17:36:06 christos Exp $ 1# $NetBSD: bsd.own.mk,v 1.873 2015/09/25 08:24:20 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#
@@ -68,28 +68,30 @@ HAVE_GCC?= 0 @@ -68,28 +68,30 @@ HAVE_GCC?= 0
68HAVE_GCC?= 48 68HAVE_GCC?= 48
69.endif 69.endif
70 70
71# 71#
72# Platforms that can't run a modern GCC natively 72# Platforms that can't run a modern GCC natively
73.if ${MACHINE_ARCH} == "m68000" 73.if ${MACHINE_ARCH} == "m68000"
74MKGCCCMDS?= no 74MKGCCCMDS?= no
75.endif 75.endif
76 76
77# 77#
78# We import the old gcc as "gcc.old" when upgrading. EXTERNAL_GCC_SUBDIR is 78# We import the old gcc as "gcc.old" when upgrading. EXTERNAL_GCC_SUBDIR is
79# set to the relevant subdirectory in src/external/gpl3 for his HAVE_GCC. 79# set to the relevant subdirectory in src/external/gpl3 for his HAVE_GCC.
80# 80#
81.if ${HAVE_GCC} == 48 81.if ${HAVE_GCC} == 5
82EXTERNAL_GCC_SUBDIR= gcc 82EXTERNAL_GCC_SUBDIR= gcc
 83.elif ${HAVE_GCC} == 48
 84EXTERNAL_GCC_SUBDIR= gcc.old
83.else 85.else
84EXTERNAL_GCC_SUBDIR= /does/not/exist 86EXTERNAL_GCC_SUBDIR= /does/not/exist
85.endif 87.endif
86.else 88.else
87MKGCCCMDS?= no 89MKGCCCMDS?= no
88.endif 90.endif
89 91
90.if !empty(MACHINE_ARCH:Mearm*) 92.if !empty(MACHINE_ARCH:Mearm*)
91_LIBC_COMPILER_RT.${MACHINE_ARCH}= yes 93_LIBC_COMPILER_RT.${MACHINE_ARCH}= yes
92.endif 94.endif
93 95
94_LIBC_COMPILER_RT.aarch64= yes 96_LIBC_COMPILER_RT.aarch64= yes
95_LIBC_COMPILER_RT.i386= yes 97_LIBC_COMPILER_RT.i386= yes