From 1956332deb45494ccc1c10655e07754c3faafa69 Mon Sep 17 00:00:00 2001 From: mrg Date: Tue, 11 Aug 2020 09:51:57 +0000 Subject: [PATCH] =?UTF-8?q?update=20GCC=207=20version=20to=20nb4=202020081?= =?UTF-8?q?0,=20and=20fix=20the=20unknown=20GCC=20version=20error=20assign?= =?UTF-8?q?ment=20from=20"=3D=3F"=20to=20"=3F=3D"=20so=20it=20works=20as?= =?UTF-8?q?=20designed.?= --- share/mk/bsd.own.mk | 4 ++-- tools/gcc/gcc-version.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/share/mk/bsd.own.mk b/share/mk/bsd.own.mk index c2b3e11065e8..6ca2cb9e9760 100644 --- a/share/mk/bsd.own.mk +++ b/share/mk/bsd.own.mk @@ -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 diff --git a/tools/gcc/gcc-version.mk b/tools/gcc/gcc-version.mk index a5d9f5748c53..15bbb550a155 100644 --- a/tools/gcc/gcc-version.mk +++ b/tools/gcc/gcc-version.mk @@ -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