svn commit: r323297 - stable/11

[Ngie Cooper]

Author: ngie
Date: Fri Sep  8 04:33:24 2017
New Revision: 323297
URL: https://svnweb.freebsd.org/changeset/base/323297

Log:
  MFC r322633:
  
  Honor NO_RTLD for rtld-elf, similar to what's done in libexec/Makefile, with
  libexec/rtld-elf/... for MK_{LIB32,LIBSOFT}.

Modified:
  stable/11/Makefile.libcompat
Directory Properties:
  stable/11/   (props changed)

Modified: stable/11/Makefile.libcompat
==============================================================================
--- stable/11/Makefile.libcompat	Fri Sep  8 04:32:02 2017	(r323296)
+++ stable/11/Makefile.libcompat	Fri Sep  8 04:33:24 2017	(r323297)
@@ -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} \