From owner-svn-src-projects@freebsd.org Fri Apr 26 08:15:56 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 DAA94158CC01 for ; Fri, 26 Apr 2019 08:15:56 +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 827BE889D5; Fri, 26 Apr 2019 08:15:56 +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 5F78A8BB0; Fri, 26 Apr 2019 08:15:56 +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 x3Q8FuL0022314; Fri, 26 Apr 2019 08:15:56 GMT (envelope-from ngie@FreeBSD.org) Received: (from ngie@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x3Q8FumA022313; Fri, 26 Apr 2019 08:15:56 GMT (envelope-from ngie@FreeBSD.org) Message-Id: <201904260815.x3Q8FumA022313@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 08:15:56 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r346734 - 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: 346734 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 827BE889D5 X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-2.95 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; NEURAL_HAM_MEDIUM(-1.00)[-0.995,0]; NEURAL_HAM_SHORT(-0.96)[-0.958,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: Fri, 26 Apr 2019 08:15:57 -0000 Author: ngie Date: Fri Apr 26 08:15:55 2019 New Revision: 346734 URL: https://svnweb.freebsd.org/changeset/base/346734 Log: Use CROSSENV when building `_coverage_libs` instead of just a part of CFLAGS This will set MACHINE_CPUARCH, MACHINE, etc, based on the TARGET specific variables. Modified: projects/runtime-coverage-v2/Makefile.inc1 Modified: projects/runtime-coverage-v2/Makefile.inc1 ============================================================================== --- projects/runtime-coverage-v2/Makefile.inc1 Fri Apr 26 08:03:29 2019 (r346733) +++ projects/runtime-coverage-v2/Makefile.inc1 Fri Apr 26 08:15:55 2019 (r346734) @@ -2507,14 +2507,15 @@ 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; \ - ${MAKE} CFLAGS="${XCFLAGS:M*target=} ${CFLAGS}" \ - DIRPRFX=${_tool}/ all; \ - ${MAKE} CFLAGS="${XCFLAGS:M*target=} ${CFLAGS}" \ - DIRPRFX=${_tool}/ DESTDIR=${WORLDTMP} install + ${CROSSENV} ${MAKE} DIRPRFX=${_tool}/ all; \ + ${CROSSENV} ${MAKE} DIRPRFX=${_tool}/ DESTDIR=${WORLDTMP} install .endfor #