diff options
| author | Enji Cooper <ngie@FreeBSD.org> | 2017-09-30 21:00:08 +0000 |
|---|---|---|
| committer | Enji Cooper <ngie@FreeBSD.org> | 2017-09-30 21:00:08 +0000 |
| commit | 90d1f60e27d27fcca6f164be195a3e5392af2a53 (patch) | |
| tree | 0477527661671499ad1855fb91e06fc7772619fc /Makefile.libcompat | |
| parent | d7bbccdd82da43104c43e3de1650d3d2e894d32c (diff) | |
| download | src-test2-90d1f60e27d27fcca6f164be195a3e5392af2a53.tar.gz src-test2-90d1f60e27d27fcca6f164be195a3e5392af2a53.zip | |
Adjust r322633 to only apply to libexec/rtld-elf, and not usr.bin/ldd,
when running build32/install32
This unbreaks installing usr.bin/ldd as ldd32 when NO_RTLD is defined.
MFC after: 1 week
MFC with: r322633
Notes
Notes:
svn path=/head/; revision=324143
Diffstat (limited to 'Makefile.libcompat')
| -rw-r--r-- | Makefile.libcompat | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/Makefile.libcompat b/Makefile.libcompat index 6918e5f73021..9066306298bc 100644 --- a/Makefile.libcompat +++ b/Makefile.libcompat @@ -179,10 +179,12 @@ build${libcompat}: .PHONY .endfor ${_+_}cd ${.CURDIR}; \ ${LIBCOMPATWMAKE} -f Makefile.inc1 -DNO_FSCHG libraries -.if ${libcompat} == "32" && !defined(NO_RTLD) +.if ${libcompat} == "32" .for _t in ${_obj} all +.if !defined(NO_RTLD) ${_+_}cd ${.CURDIR}/libexec/rtld-elf; PROG=ld-elf32.so.1 ${LIBCOMPATWMAKE} \ -DNO_FSCHG DIRPRFX=libexec/rtld-elf/ ${_t} +.endif ${_+_}cd ${.CURDIR}/usr.bin/ldd; PROG=ldd32 ${LIBCOMPATWMAKE} \ DIRPRFX=usr.bin/ldd ${_t} .endfor @@ -192,9 +194,11 @@ distribute${libcompat} install${libcompat}: .PHONY .for _dir in ${_LC_LIBDIRS.yes} ${_+_}cd ${.CURDIR}/${_dir}; ${LIBCOMPATIMAKE} ${.TARGET:S/${libcompat}$//} .endfor -.if ${libcompat} == "32" && !defined(NO_RTLD) +.if ${libcompat} == "32" +.if !defined(NO_RTLD) ${_+_}cd ${.CURDIR}/libexec/rtld-elf; \ PROG=ld-elf32.so.1 ${LIBCOMPATIMAKE} ${.TARGET:S/32$//} +.endif ${_+_}cd ${.CURDIR}/usr.bin/ldd; PROG=ldd32 ${LIBCOMPATIMAKE} \ ${.TARGET:S/32$//} .endif |