Skip to content

Commit

Permalink
Honor NO_RTLD for rtld-elf, similar to what's done in libexec/Makefil…
Browse files Browse the repository at this point in the history
…e, with

libexec/rtld-elf/... for MK_{LIB32,LIBSOFT}.

MFC after:	1 week
  • Loading branch information
ngie-eign committed Aug 17, 2017
1 parent a7e5013 commit 08ef9d7
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions Makefile.libcompat
Original file line number Diff line number Diff line change
Expand Up @@ -179,7 +179,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}
Expand All @@ -192,7 +192,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} \
Expand Down

0 comments on commit 08ef9d7

Please sign in to comment.