svn commit: r325502 - head/lib/libclang_rt

Ngie Cooper ngie at FreeBSD.org
Tue Nov 7 05:03:53 UTC 2017


Author: ngie
Date: Tue Nov  7 05:02:36 2017
New Revision: 325502
URL: https://svnweb.freebsd.org/changeset/base/325502

Log:
  Handle arm/armv[67] hosted/targeted builds gracefully
  
  CPUTYPE (apparently) isn't defined in non-cross-builds, which caused
  arm/armv[67] hosted/targeted builds to fail when evaluating CPUTYPE.
  
  Add the :U modifier to CPUTYPE so it evaluates to "". This allows armv[67] to
  get past the conditional successfully.
  
  MFC after:	1 week
  Reported by:	bob prohaska <fbsd at www.zefox.net>

Modified:
  head/lib/libclang_rt/Makefile.inc

Modified: head/lib/libclang_rt/Makefile.inc
==============================================================================
--- head/lib/libclang_rt/Makefile.inc	Tue Nov  7 04:56:53 2017	(r325501)
+++ head/lib/libclang_rt/Makefile.inc	Tue Nov  7 05:02:36 2017	(r325502)
@@ -3,7 +3,7 @@
 .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


More information about the svn-src-all mailing list