Module Name: src
Committed By: mrg
Date: Wed Feb 6 11:05:30 UTC 2019
Modified Files:
src/share/mk: bsd.own.mk
Log Message:
move OBJECT_FMTS setting after MKCOMPAT default, so it works.
should fix mips64 builds.
To generate a diff of this commit:
cvs rdiff -u -r1.1100 -r1.1101 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.1100 src/share/mk/bsd.own.mk:1.1101
--- src/share/mk/bsd.own.mk:1.1100 Tue Feb 5 04:47:59 2019
+++ src/share/mk/bsd.own.mk Wed Feb 6 11:05:30 2019
@@ -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.sparc64= sparc64
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_LINK?= ${INSTALL} ${INSTPRIV} $
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.
#
