Module Name: src
Committed By: snj
Date: Sat Apr 11 05:36:13 UTC 2015
Modified Files:
src/share/mk [netbsd-7]: bsd.own.mk
Log Message:
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.
To generate a diff of this commit:
cvs rdiff -u -r1.829.2.5 -r1.829.2.6 src/share/mk/bsd.own.mk
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/share/mk/bsd.own.mk
diff -u src/share/mk/bsd.own.mk:1.829.2.5 src/share/mk/bsd.own.mk:1.829.2.6
--- src/share/mk/bsd.own.mk:1.829.2.5 Mon Mar 9 08:45:26 2015
+++ src/share/mk/bsd.own.mk Sat Apr 11 05:36:13 2015
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.own.mk,v 1.829.2.5 2015/03/09 08:45:26 snj Exp $
+# $NetBSD: bsd.own.mk,v 1.829.2.6 2015/04/11 05:36:13 snj Exp $
# This needs to be before bsd.init.mk
.if defined(BSD_MK_COMPAT_FILE)
@@ -72,9 +72,7 @@ HAVE_GCC?= 48
# We import the old gcc as "gcc.old" when upgrading. EXTERNAL_GCC_SUBDIR is
# set to the relevant subdirectory in src/external/gpl3 for his HAVE_GCC.
#
-.if ${HAVE_GCC} == 45
-EXTERNAL_GCC_SUBDIR= gcc.old
-.elif ${HAVE_GCC} == 48
+.if ${HAVE_GCC} == 48
EXTERNAL_GCC_SUBDIR= gcc
.else
EXTERNAL_GCC_SUBDIR= /does/not/exist