From owner-svn-src-projects@freebsd.org Sun Oct 22 07:16:36 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 45C8AE4B34B for ; Sun, 22 Oct 2017 07:16:36 +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 13399803CC; Sun, 22 Oct 2017 07:16:36 +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 v9M7GZXm010533; Sun, 22 Oct 2017 07:16:35 GMT (envelope-from ngie@FreeBSD.org) Received: (from ngie@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v9M7GZmH010532; Sun, 22 Oct 2017 07:16:35 GMT (envelope-from ngie@FreeBSD.org) Message-Id: <201710220716.v9M7GZmH010532@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: ngie set sender to ngie@FreeBSD.org using -f From: Ngie Cooper Date: Sun, 22 Oct 2017 07:16:35 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r324848 - projects/runtime-coverage X-SVN-Group: projects X-SVN-Commit-Author: ngie X-SVN-Commit-Paths: projects/runtime-coverage X-SVN-Commit-Revision: 324848 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: Sun, 22 Oct 2017 07:16:36 -0000 Author: ngie Date: Sun Oct 22 07:16:35 2017 New Revision: 324848 URL: https://svnweb.freebsd.org/changeset/base/324848 Log: Tweaks to make libraries and make installworld - Optimize/fix _prereq_libs and _generic_libs by not installing the .gcno files with "make install". This cuts down on installing unnecessary files to WORLDTMP and fixes the build, since BSD.coverage.dist wasn't being splatted on WORLDTMP. - Splat BSD.coverage.dist on ${DESTDIR}/usr/lib in distributeworld/installworld so the files will be installed to the proper places. Modified: projects/runtime-coverage/Makefile.inc1 Modified: projects/runtime-coverage/Makefile.inc1 ============================================================================== --- projects/runtime-coverage/Makefile.inc1 Sun Oct 22 07:12:55 2017 (r324847) +++ projects/runtime-coverage/Makefile.inc1 Sun Oct 22 07:16:35 2017 (r324848) @@ -1170,6 +1170,10 @@ distributeworld installworld stageworld: _installcheck -p ${DESTDIR}/${DISTDIR}/${dist}/usr >/dev/null mtree -deU -f ${.CURDIR}/etc/mtree/BSD.include.dist \ -p ${DESTDIR}/${DISTDIR}/${dist}/usr/include >/dev/null +.if ${MK_COVERAGE} != "no" + mtree -deU -f ${.CURDIR}/etc/mtree/BSD.cov.dist \ + -p ${DESTDIR}/${DISTDIR}/${dist}/usr/lib >/dev/null +.endif .if ${MK_DEBUG_FILES} != "no" mtree -deU -f ${.CURDIR}/etc/mtree/BSD.debug.dist \ -p ${DESTDIR}/${DISTDIR}/${dist}/usr/lib >/dev/null @@ -2492,7 +2496,7 @@ ${_lib}__PL: .PHONY .MAKE if [ -z "${NO_OBJ}" ]; then ${MAKE} MK_TESTS=no DIRPRFX=${_lib}/ obj; fi; \ ${MAKE} MK_TESTS=no MK_PROFILE=no -DNO_PIC \ DIRPRFX=${_lib}/ all; \ - ${MAKE} MK_TESTS=no MK_PROFILE=no -DNO_PIC \ + ${MAKE} MK_COVERAGE=no MK_TESTS=no MK_PROFILE=no -DNO_PIC \ DIRPRFX=${_lib}/ install .endif .endfor @@ -2504,7 +2508,7 @@ ${_lib}__L: .PHONY .MAKE cd ${.CURDIR}/${_lib}; \ if [ -z "${NO_OBJ}" ]; then ${MAKE} MK_TESTS=no DIRPRFX=${_lib}/ obj; fi; \ ${MAKE} MK_TESTS=no DIRPRFX=${_lib}/ all; \ - ${MAKE} MK_TESTS=no DIRPRFX=${_lib}/ install + ${MAKE} MK_COVERAGE=no MK_TESTS=no DIRPRFX=${_lib}/ install .endif .endfor