From owner-svn-src-projects@freebsd.org Sat Apr 13 23:32:29 2019 Return-Path: Delivered-To: svn-src-projects@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 8D9EC15860CC for ; Sat, 13 Apr 2019 23:32:29 +0000 (UTC) (envelope-from ngie@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 2EFAF7010C; Sat, 13 Apr 2019 23:32: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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 154321832C; Sat, 13 Apr 2019 23:32: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 x3DNWSXl037578; Sat, 13 Apr 2019 23:32:28 GMT (envelope-from ngie@FreeBSD.org) Received: (from ngie@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x3DNWSIR037577; Sat, 13 Apr 2019 23:32:28 GMT (envelope-from ngie@FreeBSD.org) Message-Id: <201904132332.x3DNWSIR037577@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: ngie set sender to ngie@FreeBSD.org using -f From: Enji Cooper Date: Sat, 13 Apr 2019 23:32:28 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r346193 - projects/runtime-coverage-v2/share/mk X-SVN-Group: projects X-SVN-Commit-Author: ngie X-SVN-Commit-Paths: projects/runtime-coverage-v2/share/mk X-SVN-Commit-Revision: 346193 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 2EFAF7010C X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-2.96 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; NEURAL_HAM_MEDIUM(-1.00)[-0.999,0]; NEURAL_HAM_SHORT(-0.96)[-0.965,0]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US]; NEURAL_HAM_LONG(-1.00)[-1.000,0] X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.29 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: Sat, 13 Apr 2019 23:32:29 -0000 Author: ngie Date: Sat Apr 13 23:32:28 2019 New Revision: 346193 URL: https://svnweb.freebsd.org/changeset/base/346193 Log: Port MK_COVERAGE changes over to bsd.lib.mk Modified: projects/runtime-coverage-v2/share/mk/bsd.lib.mk Modified: projects/runtime-coverage-v2/share/mk/bsd.lib.mk ============================================================================== --- projects/runtime-coverage-v2/share/mk/bsd.lib.mk Sat Apr 13 23:26:02 2019 (r346192) +++ projects/runtime-coverage-v2/share/mk/bsd.lib.mk Sat Apr 13 23:32:28 2019 (r346193) @@ -206,8 +206,9 @@ _SHLIBDIR:=${SHLIBDIR} .if ${MK_DEBUG_FILES} != "no" SHLIB_NAME_FULL=${SHLIB_NAME}.full .if ${MK_COVERAGE} != "no" -COVERAGEFILEDIR=${COVERAGEDIR}${_SHLIBDIR} -.if !exists(${DESTDIR}${COVERAGEFILEDIR}) +_COV_FLAG= --coverage -fprofile-dir=${COVERAGEDIR} +_COVERAGEDIR=${COVERAGEDIR}${_SHLIBDIR} +.if !exists(${DESTDIR}${_COVERAGEDIR}) COVERAGEMKDIR= .endif .endif @@ -457,11 +458,11 @@ _libinstall: .if ${MK_DEBUG_FILES} != "no" .if ${MK_COVERAGE} != "no" .if defined(COVERAGEMKDIR) - ${INSTALL} ${TAG_ARGS:D${TAG_ARGS},coverage} -d ${DESTDIR}${COVERAGEFILEDIR}/ + ${INSTALL} ${TAG_ARGS:D${TAG_ARGS},coverage} -d ${DESTDIR}${_COVERAGEDIR}/ .endif ${INSTALL} ${TAG_ARGS:D${TAG_ARGS},coverage} -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \ ${_INSTALLFLAGS} \ - ${SHLIB_NAME}.full ${DESTDIR}${COVERAGEFILEDIR}/${SHLIB_NAME} + ${SHLIB_NAME}.full ${DESTDIR}${_COVERAGEDIR}/${SHLIB_NAME} .endif .if defined(DEBUGMKDIR) ${INSTALL} ${TAG_ARGS:D${TAG_ARGS},debug} -d ${DESTDIR}${DEBUGFILEDIR}/