svn commit: r325463 - projects/runtime-coverage/share/mk

[Ngie Cooper]

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