[src/trunk]: src/share/mk move OBJECT_FMTS setting after MKCOMPAT default, so...

[mrg <mrg%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/fa5abd83b3cd
branches:  trunk
changeset: 996684:fa5abd83b3cd
user:      mrg <mrg%NetBSD.org@localhost>
date:      Wed Feb 06 11:05:30 2019 +0000

description:
move OBJECT_FMTS setting after MKCOMPAT default, so it works.

should fix mips64 builds.

diffstat:

 share/mk/bsd.own.mk |  26 +++++++++++++-------------
 1 files changed, 13 insertions(+), 13 deletions(-)

diffs (47 lines):

diff -r 099074ef980d -r fa5abd83b3cd share/mk/bsd.own.mk
--- a/share/mk/bsd.own.mk       Wed Feb 06 09:17:18 2019 +0000
+++ b/share/mk/bsd.own.mk       Wed Feb 06 11:05:30 2019 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: bsd.own.mk,v 1.1100 2019/02/05 04:47:59 mrg Exp $
+#      $NetBSD: bsd.own.mk,v 1.1101 2019/02/06 11:05:30 mrg Exp $
 
 # This needs to be before bsd.init.mk
 .if defined(BSD_MK_COMPAT_FILE)
@@ -620,18 +620,6 @@
 MACHINES.vax=          vax
 MACHINES.x86_64=       amd64
 
-# for crunchide & ldd, define the OBJECT_FMTS used by a MACHINE_ARCH
-#
-OBJECT_FMTS=
-.if    ${MACHINE_ARCH} != "alpha" && ${MACHINE_ARCH} != "ia64"
-OBJECT_FMTS+=  elf32
-.endif
-.if    ${MACHINE_ARCH} == "alpha" || ${MACHINE_ARCH:M*64*} != ""
-. if !(${MKCOMPAT:Uno} == "no" && ${MACHINE_CPU} == "mips")
-OBJECT_FMTS+=  elf64
-. endif
-.endif
-
 # OBJCOPY flags to create a.out binaries for old firmware
 # shared among src/distrib and ${MACHINE}/conf/Makefile.${MACHINE}.inc
 .if ${MACHINE_CPU} == "arm"
@@ -1319,6 +1307,18 @@
 INSTALL_SYMLINK?=      ${INSTALL} ${INSTPRIV} ${SYMLINK} ${RENAME}
 .endif
 
+# for crunchide & ldd, define the OBJECT_FMTS used by a MACHINE_ARCH
+#
+OBJECT_FMTS=
+.if    ${MACHINE_ARCH} != "alpha" && ${MACHINE_ARCH} != "ia64"
+OBJECT_FMTS+=  elf32
+.endif
+.if    ${MACHINE_ARCH} == "alpha" || ${MACHINE_ARCH:M*64*} != ""
+. if !(${MKCOMPAT:Uyes} == "no" && ${MACHINE_CPU} == "mips")
+OBJECT_FMTS+=  elf64
+. endif
+.endif
+
 #
 # Set defaults for the USE_xxx variables.
 #