Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/share/mk invert the GCC 7/8 conditional.



details:   https://anonhg.NetBSD.org/src/rev/a1c5b8235864
branches:  trunk
changeset: 931346:a1c5b8235864
user:      mrg <mrg%NetBSD.org@localhost>
date:      Mon Apr 27 03:15:12 2020 +0000

description:
invert the GCC 7/8 conditional.

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

diffstat:

 share/mk/bsd.own.mk |  21 ++++++---------------
 1 files changed, 6 insertions(+), 15 deletions(-)

diffs (37 lines):

diff -r 6c6f12142ca6 -r a1c5b8235864 share/mk/bsd.own.mk
--- a/share/mk/bsd.own.mk       Mon Apr 27 02:54:42 2020 +0000
+++ b/share/mk/bsd.own.mk       Mon Apr 27 03:15:12 2020 +0000
@@ -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 @@
 #
 # 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



Home | Main Index | Thread Index | Old Index