svn commit: r346734 - projects/runtime-coverage-v2

[Enji Cooper]

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
 
 #