Module Name: src Committed By: mrg Date: Mon Feb 4 00:05:21 UTC 2019
Modified Files: src/usr.bin/ldd/build: Makefile src/usr.bin/ldd/elf64: Makefile Log Message: don't build ldd64 support if !MKCOMPAT and mips64. To generate a diff of this commit: cvs rdiff -u -r1.5 -r1.6 src/usr.bin/ldd/build/Makefile cvs rdiff -u -r1.11 -r1.12 src/usr.bin/ldd/elf64/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
Modified files: Index: src/usr.bin/ldd/build/Makefile diff -u src/usr.bin/ldd/build/Makefile:1.5 src/usr.bin/ldd/build/Makefile:1.6 --- src/usr.bin/ldd/build/Makefile:1.5 Sun Jan 27 05:17:48 2019 +++ src/usr.bin/ldd/build/Makefile Mon Feb 4 00:05:20 2019 @@ -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 @@ EXTRA_LIBS+= ${LIB_ELF32DIR}/libldd_elf3 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} != "" Index: src/usr.bin/ldd/elf64/Makefile diff -u src/usr.bin/ldd/elf64/Makefile:1.11 src/usr.bin/ldd/elf64/Makefile:1.12 --- src/usr.bin/ldd/elf64/Makefile:1.11 Sun Jan 27 05:14:45 2019 +++ src/usr.bin/ldd/elf64/Makefile Mon Feb 4 00:05:20 2019 @@ -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 @@ RTLD_FUNCS = \ 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"