svn commit: r325428 - projects/runtime-coverage/lib/libclang_rt

[Ngie Cooper]

Author: ngie
Date: Sun Nov  5 07:48:40 2017
New Revision: 325428
URL: https://svnweb.freebsd.org/changeset/base/325428

Log:
  Simplify r325427
  
  CROSSENV (in Makefile.inc1) sets CPUTYPE/MACHINE(_ARCH)? to the
  TARGET*-relevant values when building the `libraries` target.
  
  PR:	222925

Modified:
  projects/runtime-coverage/lib/libclang_rt/Makefile.inc

Modified: projects/runtime-coverage/lib/libclang_rt/Makefile.inc
==============================================================================
--- projects/runtime-coverage/lib/libclang_rt/Makefile.inc	Sun Nov  5 07:36:11 2017	(r325427)
+++ projects/runtime-coverage/lib/libclang_rt/Makefile.inc	Sun Nov  5 07:48:40 2017	(r325428)
@@ -3,11 +3,9 @@
 .include <src.opts.mk>
 
 # NOTE: based on TARGET_ABI/TARGET_CPUTYPE, set in Makefile.inc1 .
-.if defined(TARGET) && defined(TARGET_ARCH)
-.if ${TARGET} == "arm"
-.if ${TARGET_ARCH:Marmv[67]*} != "" && ${TARGET_CPUTYPE:M*soft*} == ""
+.if ${MACHINE} == "arm"
+.if ${MACHINE_ARCH:Marmv[67]*} != "" && ${CPUTYPE:M*soft*} == ""
 CRTARCH=	armhf
-.endif
 .endif
 .endif