Date: Sun, 24 Sep 2017 20:16:38 +0000 (UTC) From: Ngie Cooper <ngie@FreeBSD.org> To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r323979 - projects/runtime-coverage/share/mk Message-ID: <201709242016.v8OKGcLU023127@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201709242016.v8OKGcLU023127>