From owner-svn-src-projects@freebsd.org Thu Oct 5 07:10:29 2017 Return-Path: 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 F0F9CE2EE5C for ; Thu, 5 Oct 2017 07:10:29 +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 C72363A0E; Thu, 5 Oct 2017 07:10:29 +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 v957ASGi004337; Thu, 5 Oct 2017 07:10:28 GMT (envelope-from ngie@FreeBSD.org) Received: (from ngie@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v957ASgC004334; Thu, 5 Oct 2017 07:10:28 GMT (envelope-from ngie@FreeBSD.org) Message-Id: <201710050710.v957ASgC004334@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: ngie set sender to ngie@FreeBSD.org using -f From: Ngie Cooper Date: Thu, 5 Oct 2017 07:10:28 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r324294 - 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: 324294 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 " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 05 Oct 2017 07:10:30 -0000 Author: ngie Date: Thu Oct 5 07:10:28 2017 New Revision: 324294 URL: https://svnweb.freebsd.org/changeset/base/324294 Log: Fix .gcda to .pico (bsd.lib.mk) and .o (bsd.prog.mk) dependency mapping The logic wasn't using a filtered version of SRCS -- it was using the unfiltered version. This was causing some hilarity with unnecessary dependencies, like headers and the like in lib/libc/... . Also use .pico with bsd.lib.mk, not .o -- .o doesn't use SHARED_C*FLAGS, which doesn't contain _COV_FLAG, which means that the .gcda's would have relied on objects that didn't build them as a side-effect. Modified: projects/runtime-coverage/share/mk/bsd.cov.mk projects/runtime-coverage/share/mk/bsd.lib.mk projects/runtime-coverage/share/mk/bsd.prog.mk Modified: projects/runtime-coverage/share/mk/bsd.cov.mk ============================================================================== --- projects/runtime-coverage/share/mk/bsd.cov.mk Thu Oct 5 06:54:25 2017 (r324293) +++ projects/runtime-coverage/share/mk/bsd.cov.mk Thu Oct 5 07:10:28 2017 (r324294) @@ -19,7 +19,6 @@ FILESGROUPS+= GCDAS CLEANFILES+= ${GCDAS} .for _gcda in ${GCDAS} -${_gcda}: ${_gcda:R}.o GCDASDIR_${_gcda:T}= ${COVERAGEDIR}${_gcda:H:tA} .endfor .endif Modified: projects/runtime-coverage/share/mk/bsd.lib.mk ============================================================================== --- projects/runtime-coverage/share/mk/bsd.lib.mk Thu Oct 5 06:54:25 2017 (r324293) +++ projects/runtime-coverage/share/mk/bsd.lib.mk Thu Oct 5 07:10:28 2017 (r324294) @@ -75,7 +75,7 @@ CXXFLAGS+= ${DEBUG_FILES_CFLAGS} CTFFLAGS+= -g _WANTS_DEBUG= .endif -.if ${MK_COVERAGE} != "no" && defined(_WANTS_DEBUG) +.if ${MK_COVERAGE} != "no" && defined(_WANTS_DEBUG) && defined(SHLIB_NAME) _COV_FLAG= --coverage SHARED_CFLAGS+= ${_COV_FLAG} SHARED_CXXFLAGS+= ${_COV_FLAG} @@ -460,8 +460,11 @@ _libinstall: .include .if defined(_COV_FLAG) _GCDA_SRCS= ${SRCS:M*.c} ${SRCS:M*.cc} ${SRCS:M*.cpp} ${SRCS:M*.cxx} ${SRCS:M*.C} -GCDAS= ${SRCS:R:S/$/.gcda/g} +GCDAS= ${_GCDA_SRCS:R:S/$/.gcda/g} .undef _GCDA_SRCS +.for _gcda in ${GCDAS} +${_gcda}: ${_gcda:R}.pico +.endfor .include .endif .include Modified: projects/runtime-coverage/share/mk/bsd.prog.mk ============================================================================== --- projects/runtime-coverage/share/mk/bsd.prog.mk Thu Oct 5 06:54:25 2017 (r324293) +++ projects/runtime-coverage/share/mk/bsd.prog.mk Thu Oct 5 07:10:28 2017 (r324294) @@ -303,8 +303,11 @@ NLSNAME?= ${PROG} .include .if defined(_COV_FLAG) _GCDA_SRCS= ${SRCS:M*.c} ${SRCS:M*.cc} ${SRCS:M*.cpp} ${SRCS:M*.cxx} ${SRCS:M*.C} -GCDAS= ${SRCS:R:S/$/.gcda/g} +GCDAS= ${_GCDA_SRCS:R:S/$/.gcda/g} .undef _GCDA_SRCS +.for _gcda in ${GCDAS} +${_gcda}: ${_gcda:R}.pico +.endfor .include .endif .include