From owner-svn-src-projects@freebsd.org  Mon Nov  6 01:00:53 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 47CC5E566CC
 for <svn-src-projects@mailman.ysv.freebsd.org>;
 Mon,  6 Nov 2017 01:00:53 +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 1791672B34;
 Mon,  6 Nov 2017 01:00:53 +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 vA610qDg073020;
 Mon, 6 Nov 2017 01:00:52 GMT (envelope-from ngie@FreeBSD.org)
Received: (from ngie@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id vA610qpx073019;
 Mon, 6 Nov 2017 01:00:52 GMT (envelope-from ngie@FreeBSD.org)
Message-Id: <201711060100.vA610qpx073019@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: Mon, 6 Nov 2017 01:00:52 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
Subject: svn commit: r325463 - 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: 325463
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: Mon, 06 Nov 2017 01:00:53 -0000

Author: ngie
Date: Mon Nov  6 01:00:52 2017
New Revision: 325463
URL: https://svnweb.freebsd.org/changeset/base/325463

Log:
  Refactor how PIC_OBJS is defined/used; remove beforelinking dependency

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 Nov  5 22:36:32 2017	(r325462)
+++ projects/runtime-coverage/share/mk/bsd.lib.mk	Mon Nov  6 01:00:52 2017	(r325463)
@@ -238,12 +238,7 @@ CLEANFILES+=	lib${LIB_PRIVATE}${LIB}.bc lib${LIB_PRIVA
 SOBJS+=		${OBJS:.o=.pico}
 DEPENDOBJS+=	${SOBJS}
 CLEANFILES+=	${SOBJS}
-.if defined(INSTALL_PIC_ARCHIVE) && ${MK_COVERAGE} != "no"
-SPOBJS:=	${SOBJS:.pico=.ppico}
-DEPENDOBJS+=	${SPOBJS}
-CLEANFILES+=	${SPOBJS}
 .endif
-.endif
 
 .if defined(SHLIB_NAME)
 _LIBS+=		${SHLIB_NAME}
@@ -260,7 +255,7 @@ SOLINKOPTS+=	-Wl,--fatal-warnings
 SOLINKOPTS+=	-Wl,--warn-shared-textrel
 
 .if target(beforelinking)
-beforelinking: ${SOBJS} ${SPOBJS}
+beforelinking: ${SOBJS}
 ${SHLIB_NAME_FULL}: beforelinking
 .endif
 
@@ -309,7 +304,9 @@ ${SHLIB_NAME}.debug: ${SHLIB_NAME_FULL}
 _LIBS+=		lib${LIB_PRIVATE}${LIB}_pic.a
 
 .if ${MK_COVERAGE} != "no"
-PIC_OBJS:=	${SPOBJS}
+PIC_OBJS:=	${SOBJS:.pico=.ppico}
+DEPENDOBJS+=	${PIC_OBJS}
+CLEANFILES+=	${PIC_OBJS}
 .else
 PIC_OBJS:=	${SOBJS}
 .endif