Source-Changes-HG archive

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

[src/trunk]: src/usr.bin/ldd don't build ldd64 support if !MKCOMPAT and mips64.



details:   https://anonhg.NetBSD.org/src/rev/a97ece2d0a15
branches:  trunk
changeset: 448469:a97ece2d0a15
user:      mrg <mrg%NetBSD.org@localhost>
date:      Mon Feb 04 00:05:20 2019 +0000

description:
don't build ldd64 support if !MKCOMPAT and mips64.

diffstat:

 usr.bin/ldd/build/Makefile |  6 ++++--
 usr.bin/ldd/elf64/Makefile |  6 ++++--
 2 files changed, 8 insertions(+), 4 deletions(-)

diffs (43 lines):

diff -r 1686d2b8bd5c -r a97ece2d0a15 usr.bin/ldd/build/Makefile
--- a/usr.bin/ldd/build/Makefile        Mon Feb 04 00:03:24 2019 +0000
+++ b/usr.bin/ldd/build/Makefile        Mon Feb 04 00:05:20 2019 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.5 2019/01/27 05:17:48 kre Exp $
+#      $NetBSD: Makefile,v 1.6 2019/02/04 00:05:20 mrg Exp $
 
 NOSANITIZER=           # defined
 
@@ -17,9 +17,11 @@
 CPPFLAGS.ldd.c+= -DELF64_ONLY
 .endif
 
-.if (${MACHINE_ARCH} == "mips64el") || (${MACHINE_ARCH} == "mips64eb")
+.if ${MKCOMPAT} != "no"
+. if (${MACHINE_ARCH} == "mips64el") || (${MACHINE_ARCH} == "mips64eb")
 LIB_ELF32COMPATDIR!=   cd ${.CURDIR}/../elf32_compat && ${PRINTOBJDIR}
 EXTRA_LIBS+=           ${LIB_ELF32COMPATDIR}/libldd_elf32_compat.a
+. endif
 .endif
 
 .if ${OBJECT_FMTS:Melf64} != ""
diff -r 1686d2b8bd5c -r a97ece2d0a15 usr.bin/ldd/elf64/Makefile
--- a/usr.bin/ldd/elf64/Makefile        Mon Feb 04 00:03:24 2019 +0000
+++ b/usr.bin/ldd/elf64/Makefile        Mon Feb 04 00:05:20 2019 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.11 2019/01/27 05:14:45 kre Exp $
+#      $NetBSD: Makefile,v 1.12 2019/02/04 00:05:20 mrg Exp $
 
 NOSANITIZER=           # defined
 
@@ -40,8 +40,10 @@
 CPPFLAGS+=     -D${_d}=_elf64_${_d}
 .endfor
 
-.if (${MACHINE_ARCH} == "mips64el") || (${MACHINE_ARCH} == "mips64eb")
+.if ${MKCOMPAT} != "no"
+. if (${MACHINE_ARCH} == "mips64el") || (${MACHINE_ARCH} == "mips64eb")
 CPPFLAGS+=     -DRTLD_ARCH_SUBDIR=\"${MLIBDIR}\"
+. endif
 .endif
 
 .include "../Makefile.elf"



Home | Main Index | Thread Index | Old Index