diff --git a/lib/libclang_rt/Makefile.inc b/lib/libclang_rt/Makefile.inc
index f7687ef3376b..0bb026eb91e0 100644
--- a/lib/libclang_rt/Makefile.inc
+++ b/lib/libclang_rt/Makefile.inc
@@ -2,7 +2,7 @@
 
 .include <src.opts.mk>
 
-CRTARCH=	${MACHINE_CPUARCH:C/amd64/x86_64/}
+CRTARCH=	${TARGET_CPUARCH:C/amd64/x86_64/}
 CRTSRC=		${SRCTOP}/contrib/compiler-rt
 
 .PATH:		${CRTSRC}/lib
diff --git a/share/mk/sys.mk b/share/mk/sys.mk
index 2016e4dcdb65..aedaa1279acc 100644
--- a/share/mk/sys.mk
+++ b/share/mk/sys.mk
@@ -15,6 +15,7 @@ unix		?=	We run FreeBSD, not UNIX.
 #
 __TO_CPUARCH=C/mips(n32|64)?(el)?(hf)?/mips/:C/arm(v[67])?(eb)?/arm/:C/powerpc(64|spe)/powerpc/:C/riscv64(sf)?/riscv/
 MACHINE_CPUARCH=${MACHINE_ARCH:${__TO_CPUARCH}}
+TARGET_CPUARCH=${TARGET_ARCH:${__TO_CPUARCH}}
 .endif