summaryrefslogtreecommitdiffstats
path: root/Makefile.libcompat
diff options
context:
space:
mode:
authorngie <ngie@FreeBSD.org>2017-09-08 04:33:24 +0000
committerngie <ngie@FreeBSD.org>2017-09-08 04:33:24 +0000
commit351a23259b26fbb09337c20c5bc27ac259f4bc47 (patch)
treed861f1894ec79575399e1a9e2cb30eb28e669c37 /Makefile.libcompat
parent65e2ad2753cb13fad4a062c75c8871eb1539f047 (diff)
downloadFreeBSD-src-351a23259b26fbb09337c20c5bc27ac259f4bc47.zip
FreeBSD-src-351a23259b26fbb09337c20c5bc27ac259f4bc47.tar.gz
MFC r322633:
Honor NO_RTLD for rtld-elf, similar to what's done in libexec/Makefile, with libexec/rtld-elf/... for MK_{LIB32,LIBSOFT}.
Diffstat (limited to 'Makefile.libcompat')
-rw-r--r--Makefile.libcompat4
1 files changed, 2 insertions, 2 deletions
diff --git a/Makefile.libcompat b/Makefile.libcompat
index 420b15c..0240f16 100644
--- a/Makefile.libcompat
+++ b/Makefile.libcompat
@@ -161,7 +161,7 @@ build${libcompat}: .PHONY
.endfor
${_+_}cd ${.CURDIR}; \
${LIBCOMPATWMAKE} -f Makefile.inc1 -DNO_FSCHG libraries
-.if ${libcompat} == "32"
+.if ${libcompat} == "32" && !defined(NO_RTLD)
.for _t in obj all
${_+_}cd ${.CURDIR}/libexec/rtld-elf; PROG=ld-elf32.so.1 ${LIBCOMPATWMAKE} \
-DNO_FSCHG DIRPRFX=libexec/rtld-elf/ ${_t}
@@ -174,7 +174,7 @@ distribute${libcompat} install${libcompat}: .PHONY
.for _dir in ${_LC_LIBDIRS.yes}
${_+_}cd ${.CURDIR}/${_dir}; ${LIBCOMPATIMAKE} ${.TARGET:S/${libcompat}$//}
.endfor
-.if ${libcompat} == "32"
+.if ${libcompat} == "32" && !defined(NO_RTLD)
${_+_}cd ${.CURDIR}/libexec/rtld-elf; \
PROG=ld-elf32.so.1 ${LIBCOMPATIMAKE} ${.TARGET:S/32$//}
${_+_}cd ${.CURDIR}/usr.bin/ldd; PROG=ldd32 ${LIBCOMPATIMAKE} \
OpenPOWER on IntegriCloud