Module Name:    src
Committed By:   mrg
Date:           Mon Apr 27 03:15:12 UTC 2020

Modified Files:
        src/share/mk: bsd.own.mk

Log Message:
invert the GCC 7/8 conditional.

only alpha, vax, m68k and sh3 are still on GCC 7.


To generate a diff of this commit:
cvs rdiff -u -r1.1186 -r1.1187 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.1186 src/share/mk/bsd.own.mk:1.1187
--- src/share/mk/bsd.own.mk:1.1186	Sun Apr 26 22:06:01 2020
+++ src/share/mk/bsd.own.mk	Mon Apr 27 03:15:12 2020
@@ -1,4 +1,4 @@
-#	$NetBSD: bsd.own.mk,v 1.1186 2020/04/26 22:06:01 mrg Exp $
+#	$NetBSD: bsd.own.mk,v 1.1187 2020/04/27 03:15:12 mrg Exp $
 
 # This needs to be before bsd.init.mk
 .if defined(BSD_MK_COMPAT_FILE)
@@ -63,22 +63,13 @@ TOOLCHAIN_MISSING?=	no
 #
 # What GCC is used?
 #
-.if ${MACHINE} == "amd64" || \
-    ${MACHINE} == "i386" || \
-    ${MACHINE} == "ia64" || \
-    ${MACHINE} == "sparc" || \
-    ${MACHINE} == "sparc64" || \
-    ${MACHINE_CPU} == "aarch64" || \
-    ${MACHINE_CPU} == "arm" || \
-    ${MACHINE_CPU} == "mips" || \
-    ${MACHINE_CPU} == "powerpc" || \
-    ${MACHINE_CPU} == "powerpc64" || \
-    ${MACHINE_CPU} == "riscv" || \
-    ${MACHINE_CPU} == "hppa"
-HAVE_GCC?=	8
-.else
+.if ${MACHINE} == "alpha" || \
+    ${MACHINE} == "vax" || \
+    ${MACHINE_ARCH} == "sh3" || \
+    ${MACHINE_CPU} == "m68k"
 HAVE_GCC?=	7
 .endif
+HAVE_GCC?=	8
 
 #
 # Platforms that can't run a modern GCC natively

Reply via email to