git: 97dbe3e7ace2 - main - libclang_rt: Simplify the arm check

The branch main has been updated by andrew:

URL: https://cgit.FreeBSD.org/src/commit/?id=97dbe3e7ace2c222b18f4eb787de91ee44192e76

commit 97dbe3e7ace2c222b18f4eb787de91ee44192e76
Author:     Andrew Turner <andrew@FreeBSD.org>
AuthorDate: 2024-07-12 11:28:50 +0000
Commit:     Andrew Turner <andrew@FreeBSD.org>
CommitDate: 2024-07-12 11:31:54 +0000

    libclang_rt: Simplify the arm check
    
    We just need to check we are building for arm.
    
    Reviewed by:    manu, emaste
    Sponsored by:   Arm Ltd
    Differential Revision:  https://reviews.freebsd.org/D45644
---
 lib/libclang_rt/compiler-rt-vars.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/libclang_rt/compiler-rt-vars.mk b/lib/libclang_rt/compiler-rt-vars.mk
index 5a9f115697d9..c4a33309bc89 100644
--- a/lib/libclang_rt/compiler-rt-vars.mk
+++ b/lib/libclang_rt/compiler-rt-vars.mk
@@ -5,7 +5,7 @@ SANITIZER_SHAREDIR=		${CLANGDIR}/share
 
 # armv[67] is a bit special since we allow a soft-floating version via
 # CPUTYPE matching *soft*. This variant may not actually work though.
-.if ${MACHINE_ARCH:Marmv[67]*} != "" && \
+.if ${MACHINE_CPUARCH} == "arm" && \
     (!defined(CPUTYPE) || ${CPUTYPE:M*soft*} == "")
 CRTARCH?=	armhf
 .else