From owner-svn-src-projects@freebsd.org Mon Jul 31 09:50:49 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 394AADCECFC for ; Mon, 31 Jul 2017 09:50:49 +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 F06237046F; Mon, 31 Jul 2017 09:50:48 +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 v6V9omxi059247; Mon, 31 Jul 2017 09:50:48 GMT (envelope-from ngie@FreeBSD.org) Received: (from ngie@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v6V9om9C059246; Mon, 31 Jul 2017 09:50:48 GMT (envelope-from ngie@FreeBSD.org) Message-Id: <201707310950.v6V9om9C059246@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: ngie set sender to ngie@FreeBSD.org using -f From: Ngie Cooper Date: Mon, 31 Jul 2017 09:50:48 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r321777 - 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: 321777 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: Mon, 31 Jul 2017 09:50:49 -0000 Author: ngie Date: Mon Jul 31 09:50:47 2017 New Revision: 321777 URL: https://svnweb.freebsd.org/changeset/base/321777 Log: This Makefile snippet needs more work -- it tries to install .gcno files for .asm, .s files and it shouldn't Modified: projects/runtime-coverage/share/mk/bsd.cov.mk Modified: projects/runtime-coverage/share/mk/bsd.cov.mk ============================================================================== --- projects/runtime-coverage/share/mk/bsd.cov.mk Mon Jul 31 09:46:48 2017 (r321776) +++ projects/runtime-coverage/share/mk/bsd.cov.mk Mon Jul 31 09:50:47 2017 (r321777) @@ -1,21 +1,31 @@ # $FreeBSD$ +.ifdef notyet .include FILESGROUPS?= FILES -FILESGROUPS+= GCNOS -_GCNO_FILES= ${OBJS:.o=.gcno} -CLEANFILES+= ${_GCNO_FILES} -GCNOS+= ${_GCNO_FILES} +_GCNOGROUPS= -.for _gcno_file in ${_GCNO_FILES} -_gcno_dir= ${COVERAGEDIR}${_gcno_file:tA:H} -_gcno_fulldir= ${DESTDIR}${_gcno_dir} -GCNOSDIR_${_gcno_file:T}= ${_gcno_dir} +.for _obj in ${OBJS} +# XXX (ngie): this is pretty hamfisted +.if !empty(SRCS:T:M${obj:.o=.asm}) || !empty(SRCS:T:M${obj:.o=.s}) +_gcno= ${_obj:.o=.gcno} +_gcno_prefix= ${_gcno:H:tA} +_gcno_dir= ${COVERAGEDIR}${_gcno_prefix} -.if !target(${_gcno_fulldir}) -beforeinstall: ${_gcno_fulldir} -${_gcno_fulldir}: - ${INSTALL} ${TAG_ARGS:D${TAG_ARGS},coverage} -d ${.TARGET} +_GCNO_GROUPS+= ${_gcno_prefix} +CLEANFILES+= ${_gcno} +${_gcno_prefix}+= ${_gcno} +${_gcno_prefix}DIR= ${_gcno_dir} +${_gcno}: ${_obj} .endif .endfor + +_GCNO_GROUPS:= ${_GCNO_GROUPS:O:u} +FILESGROUPS+= ${_GCNO_GROUPS} +.for _gcno_group in ${_GCNO_GROUPS} +beforeinstall: ${DESTDIR}${${_gcno_group}DIR} +${DESTDIR}${${_gcno_group}DIR}: + ${INSTALL} ${TAG_ARGS:D${TAG_ARGS},coverage} -d ${.TARGET} +.endfor +.endif