Module Name: src
Committed By: mrg
Date: Fri Sep 25 08:24:20 UTC 2015
Modified Files:
src/share/mk: bsd.own.mk
Log Message:
move GCC 4.8 users to using gcc.old. should be no functional change.
To generate a diff of this commit:
cvs rdiff -u -r1.872 -r1.873 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.872 src/share/mk/bsd.own.mk:1.873
--- src/share/mk/bsd.own.mk:1.872 Mon Aug 17 17:36:06 2015
+++ src/share/mk/bsd.own.mk Fri Sep 25 08:24:20 2015
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.own.mk,v 1.872 2015/08/17 17:36:06 christos Exp $
+# $NetBSD: bsd.own.mk,v 1.873 2015/09/25 08:24:20 mrg Exp $
# This needs to be before bsd.init.mk
.if defined(BSD_MK_COMPAT_FILE)
@@ -78,8 +78,10 @@ MKGCCCMDS?= no
# 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} == 48
+.if ${HAVE_GCC} == 5
EXTERNAL_GCC_SUBDIR= gcc
+.elif ${HAVE_GCC} == 48
+EXTERNAL_GCC_SUBDIR= gcc.old
.else
EXTERNAL_GCC_SUBDIR= /does/not/exist
.endif
