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

[Ngie Cooper]

Author: ngie
Date: Tue Nov  7 05:07:09 2017
New Revision: 325503
URL: https://svnweb.freebsd.org/changeset/base/325503

Log:
  MFhead at r325502

Modified:
  projects/runtime-coverage/lib/libclang_rt/Makefile
  projects/runtime-coverage/lib/libclang_rt/Makefile.inc
Directory Properties:
  projects/runtime-coverage/   (props changed)

Modified: projects/runtime-coverage/lib/libclang_rt/Makefile
==============================================================================
--- projects/runtime-coverage/lib/libclang_rt/Makefile	Tue Nov  7 05:02:36 2017	(r325502)
+++ projects/runtime-coverage/lib/libclang_rt/Makefile	Tue Nov  7 05:07:09 2017	(r325503)
@@ -1,7 +1,5 @@
 # $FreeBSD$
 
-.include <src.opts.mk>
-
 .if ${MACHINE_CPUARCH} == "i386" || ${MACHINE_CPUARCH} == "amd64"
 SUBDIR+=	include
 SUBDIR+=	asan

Modified: projects/runtime-coverage/lib/libclang_rt/Makefile.inc
==============================================================================
--- projects/runtime-coverage/lib/libclang_rt/Makefile.inc	Tue Nov  7 05:02:36 2017	(r325502)
+++ projects/runtime-coverage/lib/libclang_rt/Makefile.inc	Tue Nov  7 05:07:09 2017	(r325503)
@@ -1,9 +1,9 @@
 # $FreeBSD$
 
-.include <src.opts.mk>
+.include <bsd.compiler.mk>
 
 .if ${MACHINE} == "arm"
-.if ${MACHINE_ARCH:Marmv[67]*} != "" && ${CPUTYPE:M*soft*} == ""
+.if ${MACHINE_ARCH:Marmv[67]*} != "" && ${CPUTYPE:U:M*soft*} == ""
 CRTARCH=	armhf
 .endif
 .endif