From owner-svn-src-all@freebsd.org  Sat Oct  7 18:49:41 2017
Return-Path: <owner-svn-src-all@freebsd.org>
Delivered-To: svn-src-all@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 3A5B6E3F0DD;
 Sat,  7 Oct 2017 18:49:41 +0000 (UTC)
 (envelope-from ngie@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id EC9427EADF;
 Sat,  7 Oct 2017 18:49:40 +0000 (UTC)
 (envelope-from ngie@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v97IneoD025216;
 Sat, 7 Oct 2017 18:49:40 GMT (envelope-from ngie@FreeBSD.org)
Received: (from ngie@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id v97Ine05025215;
 Sat, 7 Oct 2017 18:49:40 GMT (envelope-from ngie@FreeBSD.org)
Message-Id: <201710071849.v97Ine05025215@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: ngie set sender to
 ngie@FreeBSD.org using -f
From: Ngie Cooper <ngie@FreeBSD.org>
Date: Sat, 7 Oct 2017 18:49:40 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org
Subject: svn commit: r324392 - stable/10
X-SVN-Group: stable-10
X-SVN-Commit-Author: ngie
X-SVN-Commit-Paths: stable/10
X-SVN-Commit-Revision: 324392
X-SVN-Commit-Repository: base
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.23
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
 user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 07 Oct 2017 18:49:41 -0000

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