Source-Changes-HG archive

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

[src/trunk]: src/share/mk don't add elf64 to OBJECT_FMTS if !MKCOMPAT and mip...



details:   https://anonhg.NetBSD.org/src/rev/e1a77c0b7c13
branches:  trunk
changeset: 996505:e1a77c0b7c13
user:      mrg <mrg%NetBSD.org@localhost>
date:      Mon Feb 04 00:06:14 2019 +0000

description:
don't add elf64 to OBJECT_FMTS if !MKCOMPAT and mips64.

diffstat:

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

diffs (20 lines):

diff -r 2fb7390e2e44 -r e1a77c0b7c13 share/mk/bsd.own.mk
--- a/share/mk/bsd.own.mk       Mon Feb 04 00:05:20 2019 +0000
+++ b/share/mk/bsd.own.mk       Mon Feb 04 00:06:14 2019 +0000
@@ -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 @@
 .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
 



Home | Main Index | Thread Index | Old Index