Module Name: src
Committed By: mrg
Date: Mon Feb 4 00:06:14 UTC 2019
Modified Files:
src/share/mk: bsd.own.mk
Log Message:
don't add elf64 to OBJECT_FMTS if !MKCOMPAT and mips64.
To generate a diff of this commit:
cvs rdiff -u -r1.1097 -r1.1098 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.1097 src/share/mk/bsd.own.mk:1.1098
--- src/share/mk/bsd.own.mk:1.1097 Wed Jan 30 22:51:33 2019
+++ src/share/mk/bsd.own.mk Mon Feb 4 00:06:14 2019
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.own.mk,v 1.1097 2019/01/30 22:51:33 scole Exp $
+# $NetBSD: bsd.own.mk,v 1.1098 2019/02/04 00:06:14 mrg Exp $
# This needs to be before bsd.init.mk
.if defined(BSD_MK_COMPAT_FILE)
@@ -626,7 +626,9 @@ OBJECT_FMTS=
.if ${MACHINE_ARCH} != "alpha" && ${MACHINE_ARCH} != "ia64"
OBJECT_FMTS+= elf32
.endif
-.if ${MACHINE_ARCH} == "alpha" || ${MACHINE_ARCH:M*64*} != ""
+.if ${MACHINE_ARCH} == "alpha" || \
+ (${MACHINE_ARCH:M*64*} != "" && \
+ ${MKCOMPAT} != "no" && ${MACHINE_CPU} != "mips64el")
OBJECT_FMTS+= elf64
.endif
