Module Name: src
Committed By: mrg
Date: Tue Feb 5 04:47:59 UTC 2019
Modified Files:
src/share/mk: bsd.own.mk
Log Message:
re-do version 1.1098 properly:
- fix OBJECT_FMTS if mips64 and !MKCOMPAT
To generate a diff of this commit:
cvs rdiff -u -r1.1099 -r1.1100 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.1099 src/share/mk/bsd.own.mk:1.1100
--- src/share/mk/bsd.own.mk:1.1099 Mon Feb 4 00:34:12 2019
+++ src/share/mk/bsd.own.mk Tue Feb 5 04:47:59 2019
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.own.mk,v 1.1099 2019/02/04 00:34:12 mrg Exp $
+# $NetBSD: bsd.own.mk,v 1.1100 2019/02/05 04:47:59 mrg Exp $
# This needs to be before bsd.init.mk
.if defined(BSD_MK_COMPAT_FILE)
@@ -320,7 +320,7 @@ TOOL_CXX.pcc= ${TOOLDIR}/bin/${MACHINE_
#
DESTDIR?=
-# Don't append another copy of sysroot (coming from COMPATCPPFLAGS etc.
+# Don't append another copy of sysroot (coming from COMPATCPPFLAGS etc.)
# because it confuses Coverity. Still we need to cov-configure specially
# for each specific sysroot argument.
.if !defined(HOSTPROG) && !defined(HOSTLIB)
@@ -627,7 +627,9 @@ OBJECT_FMTS=
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
