From owner-svn-src-all@freebsd.org  Thu Mar 31 17:27:02 2016
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 6BDC1AE3111;
 Thu, 31 Mar 2016 17:27:02 +0000 (UTC)
 (envelope-from bdrewery@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 3DD971F66;
 Thu, 31 Mar 2016 17:27:02 +0000 (UTC)
 (envelope-from bdrewery@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u2VHR175076211;
 Thu, 31 Mar 2016 17:27:01 GMT (envelope-from bdrewery@FreeBSD.org)
Received: (from bdrewery@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id u2VHR1MU076209;
 Thu, 31 Mar 2016 17:27:01 GMT (envelope-from bdrewery@FreeBSD.org)
Message-Id: <201603311727.u2VHR1MU076209@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: bdrewery set sender to
 bdrewery@FreeBSD.org using -f
From: Bryan Drewery <bdrewery@FreeBSD.org>
Date: Thu, 31 Mar 2016 17:27:01 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r297461 - in head: lib/libc libexec/rtld-elf
X-SVN-Group: head
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.21
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: Thu, 31 Mar 2016 17:27:02 -0000

Author: bdrewery
Date: Thu Mar 31 17:27:01 2016
New Revision: 297461
URL: https://svnweb.freebsd.org/changeset/base/297461

Log:
  WITHOUT_TOOLCHAIN: Fix build of rtld.
  
  MK_TOOLCHAIN==no disables building and installing of pic archives.
  c_pic.a is still needed for rtld though so force it to build in lib/libc
  and link directly to the objdir version of it for rtld.
  
  Somehow this has been broken since r148725.
  
  Sponsored by:	EMC / Isilon Storage Division

Modified:
  head/lib/libc/Makefile
  head/libexec/rtld-elf/Makefile

Modified: head/lib/libc/Makefile
==============================================================================
--- head/lib/libc/Makefile	Thu Mar 31 17:15:03 2016	(r297460)
+++ head/lib/libc/Makefile	Thu Mar 31 17:27:01 2016	(r297461)
@@ -5,6 +5,9 @@ SHLIBDIR?= /lib
 
 .include <src.opts.mk>
 
+# Force building of libc_pic.a
+MK_TOOLCHAIN=	yes
+
 LIBC_SRCTOP?= ${.CURDIR}
 
 # Pick the current architecture directory for libc. In general, this is

Modified: head/libexec/rtld-elf/Makefile
==============================================================================
--- head/libexec/rtld-elf/Makefile	Thu Mar 31 17:15:03 2016	(r297460)
+++ head/libexec/rtld-elf/Makefile	Thu Mar 31 17:27:01 2016	(r297461)
@@ -45,6 +45,9 @@ CFLAGS+=	-fvisibility=hidden
 .endif
 LDFLAGS+=	-shared -Wl,-Bsymbolic
 LIBADD=		c_pic
+.if ${MK_TOOLCHAIN} == "no"
+LDFLAGS+=	-L${LIBCDIR}
+.endif
 
 .if ${MACHINE_CPUARCH} == "arm"
 # Some of the required math functions (div & mod) are implemented in