Author: ngie
Date: Sat Sep 30 21:00:08 2017
New Revision: 324143
URL: https://svnweb.freebsd.org/changeset/base/324143
Log:
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
Modified:
head/Makefile.libcompat
Modified: head/Makefile.libcompat
==============================================================================
--- head/Makefile.libcompat Sat Sep 30 20:50:31 2017 (r324142)
+++ head/Makefile.libcompat Sat Sep 30 21:00:08 2017 (r324143)
@@ -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
_______________________________________________
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
