Source-Changes-HG archive

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

[src/trunk]: src/share/mk allow earm* platforms to *try* to enable MKCOMPAT=y...



details:   https://anonhg.NetBSD.org/src/rev/ec027e83ee75
branches:  trunk
changeset: 345792:ec027e83ee75
user:      mrg <mrg%NetBSD.org@localhost>
date:      Thu Jun 09 00:20:53 2016 +0000

description:
allow earm* platforms to *try* to enable MKCOMPAT=yes, since it only
is a build failure, not an entirely unavailable feature.

diffstat:

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

diffs (23 lines):

diff -r c1f9c54b5142 -r ec027e83ee75 share/mk/bsd.own.mk
--- a/share/mk/bsd.own.mk       Thu Jun 09 00:19:31 2016 +0000
+++ b/share/mk/bsd.own.mk       Thu Jun 09 00:20:53 2016 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: bsd.own.mk,v 1.928 2016/06/08 19:28:47 mrg Exp $
+#      $NetBSD: bsd.own.mk,v 1.929 2016/06/09 00:20:53 mrg Exp $
 
 # This needs to be before bsd.init.mk
 .if defined(BSD_MK_COMPAT_FILE)
@@ -980,8 +980,11 @@
 .if ${MACHINE_ARCH} == "x86_64" || ${MACHINE_ARCH} == "sparc64" \
     || ${MACHINE_ARCH} == "mips64eb" || ${MACHINE_ARCH} == "mips64el" \
     || ${MACHINE_ARCH} == "powerpc64" || ${MACHINE_CPU} == "aarch64" \
-    || ${MACHINE_ARCH} == "riscv64" \
-    || (!empty(MACHINE_ARCH:Mearm*) && ${HAVE_GCC:U} == 48)
+    || ${MACHINE_ARCH} == "riscv64" || !empty(MACHINE_ARCH:Mearm*)
+. if !empty(MACHINE_ARCH:Mearm*) && ${HAVE_GCC:U} != 48
+# This seems to fail for some reason
+MKCOMPAT?=     no
+. endif
 MKCOMPAT?=     yes
 .else
 # Don't let this build where it really isn't supported.



Home | Main Index | Thread Index | Old Index