Module Name: src
Committed By: mrg
Date: Fri Jun 10 05:45:27 UTC 2016
Modified Files:
src/share/mk: bsd.own.mk
Log Message:
re-enable MKCOMPAT for arm eabi platforms, as it now works again.
To generate a diff of this commit:
cvs rdiff -u -r1.933 -r1.934 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.933 src/share/mk/bsd.own.mk:1.934
--- src/share/mk/bsd.own.mk:1.933 Fri Jun 10 05:35:33 2016
+++ src/share/mk/bsd.own.mk Fri Jun 10 05:45:27 2016
@@ -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 @@ MK${var}:= yes
|| ${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
