Aren
/
NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

This commit is contained in:
mrg 2019-02-04 00:05:20 +00:00
parent 40d6bceb8d
commit 85f6c4cfe8
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
usr.bin/ldd/build/Makefile
View File

@ -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_elf32.a
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} != ""

6
usr.bin/ldd/elf64/Makefile
View File

@ -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"