Module Name: src
Committed By: mrg
Date: Tue Aug 11 09:51:57 UTC 2020
Modified Files:
src/share/mk: bsd.own.mk
src/tools/gcc: gcc-version.mk
Log Message:
update GCC 7 version to nb4 20200810, and fix the unknown GCC version
error assignment from "=?" to "?=" so it works as designed.
To generate a diff of this commit:
cvs rdiff -u -r1.1202 -r1.1203 src/share/mk/bsd.own.mk
cvs rdiff -u -r1.18 -r1.19 src/tools/gcc/gcc-version.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.1202 src/share/mk/bsd.own.mk:1.1203
--- src/share/mk/bsd.own.mk:1.1202 Tue Jul 21 14:42:44 2020
+++ src/share/mk/bsd.own.mk Tue Aug 11 09:51:57 2020
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.own.mk,v 1.1202 2020/07/21 14:42:44 tsutsui Exp $
+# $NetBSD: bsd.own.mk,v 1.1203 2020/08/11 09:51:57 mrg Exp $
# This needs to be before bsd.init.mk
.if defined(BSD_MK_COMPAT_FILE)
@@ -83,7 +83,7 @@ EXTERNAL_GCC_SUBDIR?= gcc.old
.elif ${HAVE_GCC} == 8
EXTERNAL_GCC_SUBDIR?= gcc
.else
-EXTERNAL_GCC_SUBDIR=? /does/not/exist
+EXTERNAL_GCC_SUBDIR?= /does/not/exist
.endif
.else
MKGCCCMDS?= no
Index: src/tools/gcc/gcc-version.mk
diff -u src/tools/gcc/gcc-version.mk:1.18 src/tools/gcc/gcc-version.mk:1.19
--- src/tools/gcc/gcc-version.mk:1.18 Wed Mar 11 10:07:01 2020
+++ src/tools/gcc/gcc-version.mk Tue Aug 11 09:51:57 2020
@@ -1,9 +1,9 @@
-# $NetBSD: gcc-version.mk,v 1.18 2020/03/11 10:07:01 mrg Exp $
+# $NetBSD: gcc-version.mk,v 1.19 2020/08/11 09:51:57 mrg Exp $
# common location for tools and native build
.if ${HAVE_GCC} == 7
-NETBSD_GCC_VERSION=nb3 20190319
+NETBSD_GCC_VERSION=nb4 20200810
.elif ${HAVE_GCC} == 8
NETBSD_GCC_VERSION=nb1 20200311
.endif
