From owner-svn-src-head@freebsd.org  Tue Nov  7 05:03:53 2017
Return-Path: <owner-svn-src-head@freebsd.org>
Delivered-To: svn-src-head@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 3BA4DE4E98D;
 Tue,  7 Nov 2017 05:03:53 +0000 (UTC)
 (envelope-from ngie@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org [96.47.72.37])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 0B4C97B72C;
 Tue,  7 Nov 2017 05:03:52 +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 vA752bMb094624;
 Tue, 7 Nov 2017 05:02:37 GMT (envelope-from ngie@FreeBSD.org)
Received: (from ngie@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id vA752bG7094623;
 Tue, 7 Nov 2017 05:02:37 GMT (envelope-from ngie@FreeBSD.org)
Message-Id: <201711070502.vA752bG7094623@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: ngie set sender to
 ngie@FreeBSD.org using -f
From: Ngie Cooper <ngie@FreeBSD.org>
Date: Tue, 7 Nov 2017 05:02:37 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r325502 - head/lib/libclang_rt
X-SVN-Group: head
X-SVN-Commit-Author: ngie
X-SVN-Commit-Paths: head/lib/libclang_rt
X-SVN-Commit-Revision: 325502
X-SVN-Commit-Repository: base
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.23
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 07 Nov 2017 05:03:53 -0000

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@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