Module Name:    src
Committed By:   mrg
Date:           Wed Mar 30 20:18:18 UTC 2016

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

Log Message:
turn off MKCOMPAT for arm and GCC 5 (for now).


To generate a diff of this commit:
cvs rdiff -u -r1.914 -r1.915 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.914 src/share/mk/bsd.own.mk:1.915
--- src/share/mk/bsd.own.mk:1.914	Tue Mar 29 06:36:12 2016
+++ src/share/mk/bsd.own.mk	Wed Mar 30 20:18:18 2016
@@ -1,4 +1,4 @@
-#	$NetBSD: bsd.own.mk,v 1.914 2016/03/29 06:36:12 mrg Exp $
+#	$NetBSD: bsd.own.mk,v 1.915 2016/03/30 20:18:18 mrg Exp $
 
 # This needs to be before bsd.init.mk
 .if defined(BSD_MK_COMPAT_FILE)
@@ -969,7 +969,7 @@ MK${var}:=	yes
     || ${MACHINE_ARCH} == "mips64eb" || ${MACHINE_ARCH} == "mips64el" \
     || ${MACHINE_ARCH} == "powerpc64" || ${MACHINE_CPU} == "aarch64" \
     || ${MACHINE_ARCH} == "riscv64" \
-    || !empty(MACHINE_ARCH:Mearm*)
+    || (!empty(MACHINE_ARCH:Mearm*) && ${HAVE_GCC:U} == 48)
 MKCOMPAT?=	yes
 .else
 # Don't let this build where it really isn't supported.

Reply via email to