From owner-svn-src-projects@freebsd.org Fri Apr 26 11:29:01 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 0ADA71591144 for ; Fri, 26 Apr 2019 11:29:01 +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 973A78F12D; Fri, 26 Apr 2019 11:29:00 +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 6790EACDA; Fri, 26 Apr 2019 11:29:00 +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 x3QBT0XX022505; Fri, 26 Apr 2019 11:29:00 GMT (envelope-from ngie@FreeBSD.org) Received: (from ngie@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x3QBT068022499; Fri, 26 Apr 2019 11:29:00 GMT (envelope-from ngie@FreeBSD.org) Message-Id: <201904261129.x3QBT068022499@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: ngie set sender to ngie@FreeBSD.org using -f From: Enji Cooper Date: Fri, 26 Apr 2019 11:29:00 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r346738 - projects/runtime-coverage-v2 X-SVN-Group: projects X-SVN-Commit-Author: ngie X-SVN-Commit-Paths: projects/runtime-coverage-v2 X-SVN-Commit-Revision: 346738 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 973A78F12D X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-2.97 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; NEURAL_HAM_MEDIUM(-1.00)[-0.995,0]; NEURAL_HAM_LONG(-1.00)[-1.000,0]; NEURAL_HAM_SHORT(-0.98)[-0.976,0]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US] 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: Fri, 26 Apr 2019 11:29:01 -0000 Author: ngie Date: Fri Apr 26 11:28:59 2019 New Revision: 346738 URL: https://svnweb.freebsd.org/changeset/base/346738 Log: Make --coverage work by building the coverage libraries for the toolchain prior to building the rest of the libraries Geez louise this took a long time to get to this point. Sometimes the hammer solution is best ;). Modified: projects/runtime-coverage-v2/Makefile.inc1 Modified: projects/runtime-coverage-v2/Makefile.inc1 ============================================================================== --- projects/runtime-coverage-v2/Makefile.inc1 Fri Apr 26 11:12:51 2019 (r346737) +++ projects/runtime-coverage-v2/Makefile.inc1 Fri Apr 26 11:28:59 2019 (r346738) @@ -722,7 +722,7 @@ TMAKE= \ XMAKE= ${BMAKE} \ TARGET=${TARGET} TARGET_ARCH=${TARGET_ARCH} \ MK_GDB=no \ - MK_TESTS=no MK_COVERAGE=no MK_COVERAGE_SUPPORT=${MK_COVERAGE} + MK_TESTS=no MK_COVERAGE=no # kernel-tools stage KTMAKEENV= INSTALL="sh ${.CURDIR}/tools/install.sh" \ @@ -2466,9 +2466,6 @@ _elftctools= lib/libelftc \ .endif .if ${MK_CLANG_BOOTSTRAP} != "no" -.if ${MK_COVERAGE_SUPPORT} != "no" -_coverage_libs+= lib/libclang_rt/profile -.endif _clang= usr.bin/clang .endif .if ${MK_LLD_BOOTSTRAP} != "no" @@ -2507,16 +2504,6 @@ cross-tools: .MAKE .PHONY ${MAKE} DIRPRFX=${_tool}/ all; \ ${MAKE} DIRPRFX=${_tool}/ DESTDIR=${WORLDTMP} install .endfor - # Build coverage libraries for the target. This must be done here in - # order for the cross-toolchain to be able to find them with - # `make libraries` and the rest of buildworld. -.for _tool in ${_coverage_libs} - ${_+_}@${ECHODIR} "===> ${_tool} (obj,all,install)"; \ - cd ${.CURDIR}/${_tool}; \ - if [ -z "${NO_OBJWALK}" ]; then ${MAKE} DIRPRFX=${_tool}/ obj; fi; \ - ${CROSSENV} ${MAKE} DIRPRFX=${_tool}/ all; \ - ${CROSSENV} ${MAKE} DIRPRFX=${_tool}/ DESTDIR=${WORLDTMP} install -.endfor # # native-xtools is the current target for qemu-user cross builds of ports @@ -2720,10 +2707,31 @@ hierarchy hier: .MAKE .PHONY # libraries: .MAKE .PHONY ${_+_}cd ${.CURDIR}; \ + ${MAKE} -f Makefile.inc1 _target_toolchain_libs MK_COVERAGE=no \ + MK_COVERAGE_SUPPORT=${MK_COVERAGE}; \ ${MAKE} -f Makefile.inc1 _prereq_libs; \ ${MAKE} -f Makefile.inc1 _startup_libs; \ ${MAKE} -f Makefile.inc1 _prebuild_libs; \ ${MAKE} -f Makefile.inc1 _generic_libs + +# Build coverage libraries for the target. This must be done here in +# order for the cross-toolchain to be able to find them with +# `make libraries` and the rest of buildworld. +.if ${MK_CLANG_BOOTSTRAP} != "no" +.if ${MK_COVERAGE_SUPPORT} != "no" +_coverage_libs+= lib/libclang_rt/profile +.endif +.endif + +_target_toolchain_libs: .PHONY .MAKE +.for _tool in \ + ${_coverage_libs} + ${_+_}@${ECHODIR} "===> ${_tool} (obj,all,install)"; \ + cd ${.CURDIR}/${_tool}; \ + if [ -z "${NO_OBJWALK}" ]; then ${MAKE} DIRPRFX=${_tool}/ obj; fi; \ + ${MAKE} DIRPRFX=${_tool}/ all; \ + ${MAKE} DIRPRFX=${_tool}/ DESTDIR=${WORLDTMP} install +.endfor # # static libgcc.a prerequisite for shared libc