Source-Changes-HG archive

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

[src/trunk]: src/share/mk re-enable MKCOMPAT for arm eabi platforms, as it no...



details:   https://anonhg.NetBSD.org/src/rev/c25c987fffe2
branches:  trunk
changeset: 815973:c25c987fffe2
user:      mrg <mrg%NetBSD.org@localhost>
date:      Fri Jun 10 05:45:27 2016 +0000

description:
re-enable MKCOMPAT for arm eabi platforms, as it now works again.

diffstat:

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

diffs (27 lines):

diff -r 5f19c619a578 -r c25c987fffe2 share/mk/bsd.own.mk
--- a/share/mk/bsd.own.mk       Fri Jun 10 05:35:33 2016 +0000
+++ b/share/mk/bsd.own.mk       Fri Jun 10 05:45:27 2016 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: bsd.own.mk,v 1.933 2016/06/10 05:35:33 mrg Exp $
+#      $NetBSD: bsd.own.mk,v 1.934 2016/06/10 05:45:27 mrg Exp $
 
 # This needs to be before bsd.init.mk
 .if defined(BSD_MK_COMPAT_FILE)
@@ -981,14 +981,13 @@
     || ${MACHINE_ARCH} == "mips64eb" || ${MACHINE_ARCH} == "mips64el" \
     || ${MACHINE_ARCH} == "powerpc64" || ${MACHINE_CPU} == "aarch64" \
     || ${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.
 MKCOMPAT:=     no
+.endif
+
+.if ${MKCOMPAT} == "no"
 MKCOMPATTESTS:=        no
 MKCOMPATX11:=  no
 .endif



Home | Main Index | Thread Index | Old Index