From owner-svn-src-projects@freebsd.org  Sun Sep 24 20:16:39 2017
Return-Path: <owner-svn-src-projects@freebsd.org>
Delivered-To: svn-src-projects@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 5499DE002FC
 for <svn-src-projects@mailman.ysv.freebsd.org>;
 Sun, 24 Sep 2017 20:16:39 +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 2256E19C1;
 Sun, 24 Sep 2017 20:16:39 +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 v8OKGcmU023128;
 Sun, 24 Sep 2017 20:16:38 GMT (envelope-from ngie@FreeBSD.org)
Received: (from ngie@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id v8OKGcLU023127;
 Sun, 24 Sep 2017 20:16:38 GMT (envelope-from ngie@FreeBSD.org)
Message-Id: <201709242016.v8OKGcLU023127@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: Sun, 24 Sep 2017 20:16:38 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
Subject: svn commit: r323979 - projects/runtime-coverage/share/mk
X-SVN-Group: projects
X-SVN-Commit-Author: ngie
X-SVN-Commit-Paths: projects/runtime-coverage/share/mk
X-SVN-Commit-Revision: 323979
X-SVN-Commit-Repository: base
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.23
Precedence: list
List-Id: "SVN commit messages for the src &quot; projects&quot;
 tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-projects>, 
 <mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects/>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
 <mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 24 Sep 2017 20:16:39 -0000

Author: ngie
Date: Sun Sep 24 20:16:38 2017
New Revision: 323979
URL: https://svnweb.freebsd.org/changeset/base/323979

Log:
  Unbreak pic library link/compilation when MK_COVERAGE == no
  
  Use a separate variable (PIC_OBJS) for the objects that should be in a
  pic-enabled static library.
  
  This unbreaks libexec/rtld-elf compilation when MK_COVERAGE == no.

Modified:
  projects/runtime-coverage/share/mk/bsd.lib.mk

Modified: projects/runtime-coverage/share/mk/bsd.lib.mk
==============================================================================
--- projects/runtime-coverage/share/mk/bsd.lib.mk	Sun Sep 24 20:05:48 2017	(r323978)
+++ projects/runtime-coverage/share/mk/bsd.lib.mk	Sun Sep 24 20:16:38 2017	(r323979)
@@ -312,13 +312,15 @@ ${SHLIB_NAME}.debug: ${SHLIB_NAME_FULL}
 _LIBS+=		lib${LIB_PRIVATE}${LIB}_pic.a
 
 .if ${MK_COVERAGE} != "no"
-lib${LIB_PRIVATE}${LIB}_pic.a: ${SPOBJS}
+PIC_OBJS=	${SPOBJS}
 .else
-lib${LIB_PRIVATE}${LIB}_pic.a: ${SOBJS}
+PIC_OBJS=	${SOBJS}
 .endif
+
+lib${LIB_PRIVATE}${LIB}_pic.a: ${PIC_OBJS}
 	@${ECHO} building special pic ${LIB} library
 	@rm -f ${.TARGET}
-	${AR} ${ARFLAGS} ${.TARGET} ${SPOBJS} ${ARADD}
+	${AR} ${ARFLAGS} ${.TARGET} ${PIC_OBJS} ${ARADD}
 	${RANLIB} ${RANLIBFLAGS} ${.TARGET}
 .endif