Source-Changes-HG archive

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

[src/trunk]: src/share/mk re-do version 1.1098 properly:



details:   https://anonhg.NetBSD.org/src/rev/aa1f92bac643
branches:  trunk
changeset: 448544:aa1f92bac643
user:      mrg <mrg%NetBSD.org@localhost>
date:      Tue Feb 05 04:47:59 2019 +0000

description:
re-do version 1.1098 properly:

- fix OBJECT_FMTS if mips64 and !MKCOMPAT

diffstat:

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

diffs (28 lines):

diff -r d44b5ef82821 -r aa1f92bac643 share/mk/bsd.own.mk
--- a/share/mk/bsd.own.mk       Tue Feb 05 04:45:50 2019 +0000
+++ b/share/mk/bsd.own.mk       Tue Feb 05 04:47:59 2019 +0000
@@ -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 @@
 #
 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+=  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



Home | Main Index | Thread Index | Old Index