Sat Apr 11 05:36:13 2015 UTC ()
Pull up following revision(s) (requested by mrg in ticket #674):
	share/mk/bsd.own.mk: revision 1.845
remove support to look for GCC 4.5 in gcc.old.


(snj)
diff -r1.829.2.5 -r1.829.2.6 src/share/mk/bsd.own.mk
cvs diff -r1.829.2.5 -r1.829.2.6 src/share/mk/bsd.own.mk (expand / switch to unified diff)

--- src/share/mk/bsd.own.mk 2015/03/09 08:45:26 1.829.2.5
+++ src/share/mk/bsd.own.mk 2015/04/11 05:36:13 1.829.2.6
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: bsd.own.mk,v 1.829.2.5 2015/03/09 08:45:26 snj Exp $ 1# $NetBSD: bsd.own.mk,v 1.829.2.6 2015/04/11 05:36:13 snj 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#
@@ -62,29 +62,27 @@ MKGCC?= no @@ -62,29 +62,27 @@ MKGCC?= no
62.if ${MKGCC:Uyes} != "no" 62.if ${MKGCC:Uyes} != "no"
63 63
64.if ${MACHINE} == "playstation2" || ${MACHINE_CPU} == "aarch64" 64.if ${MACHINE} == "playstation2" || ${MACHINE_CPU} == "aarch64"
65HAVE_GCC?= 0 65HAVE_GCC?= 0
66.else 66.else
67# Otherwise, default to GCC4.8 67# Otherwise, default to GCC4.8
68HAVE_GCC?= 48 68HAVE_GCC?= 48
69.endif 69.endif
70 70
71# 71#
72# We import the old gcc as "gcc.old" when upgrading. EXTERNAL_GCC_SUBDIR is 72# We import the old gcc as "gcc.old" when upgrading. EXTERNAL_GCC_SUBDIR is
73# set to the relevant subdirectory in src/external/gpl3 for his HAVE_GCC. 73# set to the relevant subdirectory in src/external/gpl3 for his HAVE_GCC.
74# 74#
75.if ${HAVE_GCC} == 45 75.if ${HAVE_GCC} == 48
76EXTERNAL_GCC_SUBDIR= gcc.old 
77.elif ${HAVE_GCC} == 48 
78EXTERNAL_GCC_SUBDIR= gcc 76EXTERNAL_GCC_SUBDIR= gcc
79.else 77.else
80EXTERNAL_GCC_SUBDIR= /does/not/exist 78EXTERNAL_GCC_SUBDIR= /does/not/exist
81.endif 79.endif
82 80
83.endif 81.endif
84 82
85.if !empty(MACHINE_ARCH:Mearm*) 83.if !empty(MACHINE_ARCH:Mearm*)
86_LIBC_COMPILER_RT.${MACHINE_ARCH}= yes 84_LIBC_COMPILER_RT.${MACHINE_ARCH}= yes
87.endif 85.endif
88 86
89_LIBC_COMPILER_RT.aarch64= yes 87_LIBC_COMPILER_RT.aarch64= yes
90_LIBC_COMPILER_RT.i386= yes 88_LIBC_COMPILER_RT.i386= yes