svn commit: r324392 - stable/10

[Ngie Cooper]

Author: ngie
Date: Sat Oct  7 18:49:39 2017
New Revision: 324392
URL: https://svnweb.freebsd.org/changeset/base/324392

Log:
  MFC note:	MK_LIBSOFT doesn't apply to ^/stable/10 .
  
  MFC r322633,r324143:
  
  r322633:
  
  Honor NO_RTLD for rtld-elf, similar to what's done in libexec/Makefile, with
  libexec/rtld-elf/... for MK_{LIB32,LIBSOFT}.
  
  r324143:
  
  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 with:       r322633

Modified:
  stable/10/Makefile.inc1
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/Makefile.inc1
==============================================================================
--- stable/10/Makefile.inc1	Sat Oct  7 18:46:50 2017	(r324391)
+++ stable/10/Makefile.inc1	Sat Oct  7 18:49:39 2017	(r324392)
@@ -640,8 +640,10 @@ build32: .PHONY
 	${_+_}cd ${.CURDIR}; \
 	    ${LIB32WMAKE} -f Makefile.inc1 -DNO_FSCHG libraries
 .for _t in obj depend all
+.if !defined(NO_RTLD)
 	${_+_}cd ${.CURDIR}/libexec/rtld-elf; PROG=ld-elf32.so.1 ${LIB32WMAKE} \
 	    -DNO_FSCHG DIRPRFX=libexec/rtld-elf/ ${_t}
+.endif
 	${_+_}cd ${.CURDIR}/usr.bin/ldd; PROG=ldd32 ${LIB32WMAKE} \
 	    DIRPRFX=usr.bin/ldd ${_t}
 .endfor
@@ -658,8 +660,10 @@ distribute32 install32: .MAKE .PHONY
 .if ${MK_KERBEROS} != "no"
 	${_+_}cd ${.CURDIR}/kerberos5/lib; ${LIB32IMAKE} ${.TARGET:S/32$//}
 .endif
+.if !defined(NO_RTLD)
 	${_+_}cd ${.CURDIR}/libexec/rtld-elf; \
 	    PROG=ld-elf32.so.1 ${LIB32IMAKE} ${.TARGET:S/32$//}
+.endif
 	${_+_}cd ${.CURDIR}/usr.bin/ldd; PROG=ldd32 ${LIB32IMAKE} \
 	    ${.TARGET:S/32$//}
 .endif