KekenoBSD/src
3
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Honor NO_RTLD for rtld-elf, similar to what's done in libexec/Makefile, with

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

MFC after:	1 week
This commit is contained in:
Enji Cooper
2017-08-17 20:15:20 +00:00
parent 2052157d77
commit 4ff30397f5
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Makefile.libcompat
+2 -2
View File
@@ -179,7 +179,7 @@ build${libcompat}: .PHONY
.endfor .endfor
${_+_}cd ${.CURDIR}; \ ${_+_}cd ${.CURDIR}; \
${LIBCOMPATWMAKE} -f Makefile.inc1 -DNO_FSCHG libraries ${LIBCOMPATWMAKE} -f Makefile.inc1 -DNO_FSCHG libraries
.if ${libcompat} == "32" .if ${libcompat} == "32" && !defined(NO_RTLD)
.for _t in ${_obj} all .for _t in ${_obj} all
${_+_}cd ${.CURDIR}/libexec/rtld-elf; PROG=ld-elf32.so.1 ${LIBCOMPATWMAKE} \ ${_+_}cd ${.CURDIR}/libexec/rtld-elf; PROG=ld-elf32.so.1 ${LIBCOMPATWMAKE} \
-DNO_FSCHG DIRPRFX=libexec/rtld-elf/ ${_t} -DNO_FSCHG DIRPRFX=libexec/rtld-elf/ ${_t}
@@ -192,7 +192,7 @@ distribute${libcompat} install${libcompat}: .PHONY
.for _dir in ${_LC_LIBDIRS.yes} .for _dir in ${_LC_LIBDIRS.yes}
${_+_}cd ${.CURDIR}/${_dir}; ${LIBCOMPATIMAKE} ${.TARGET:S/${libcompat}$//} ${_+_}cd ${.CURDIR}/${_dir}; ${LIBCOMPATIMAKE} ${.TARGET:S/${libcompat}$//}
.endfor .endfor
.if ${libcompat} == "32" .if ${libcompat} == "32" && !defined(NO_RTLD)
${_+_}cd ${.CURDIR}/libexec/rtld-elf; \ ${_+_}cd ${.CURDIR}/libexec/rtld-elf; \
PROG=ld-elf32.so.1 ${LIBCOMPATIMAKE} ${.TARGET:S/32$//} PROG=ld-elf32.so.1 ${LIBCOMPATIMAKE} ${.TARGET:S/32$//}
${_+_}cd ${.CURDIR}/usr.bin/ldd; PROG=ldd32 ${LIBCOMPATIMAKE} \ ${_+_}cd ${.CURDIR}/usr.bin/ldd; PROG=ldd32 ${LIBCOMPATIMAKE} \