diff --git a/lib/libc/compiler_rt/Makefile.inc b/lib/libc/compiler_rt/Makefile.inc
index d8f400b56acb..dc2f65628385 100644
--- a/lib/libc/compiler_rt/Makefile.inc
+++ b/lib/libc/compiler_rt/Makefile.inc
@@ -1,13 +1,13 @@
-# $NetBSD: Makefile.inc,v 1.15 2014/02/26 22:37:56 joerg Exp $
+# $NetBSD: Makefile.inc,v 1.16 2014/03/02 03:04:52 matt Exp $
 
 COMPILER_RT_SRCDIR=	${NETBSDSRCDIR}/sys/external/bsd/compiler_rt/dist
 
-.if ${MACHINE_ARCH} == "powerpc"
+.if ${LIBC_MACHINE_ARCH} == "powerpc"
 COMPILER_RT_CPU_DIR=	${COMPILER_RT_SRCDIR}/lib/builtins/ppc
 COMPILER_RT_ARCH_DIR=	${COMPILER_RT_SRCDIR}/lib/builtins/ppc
 .else
 COMPILER_RT_CPU_DIR=	${COMPILER_RT_SRCDIR}/lib/builtins/${MACHINE_CPU}
-COMPILER_RT_ARCH_DIR=	${COMPILER_RT_SRCDIR}/lib/builtins/${MACHINE_ARCH}
+COMPILER_RT_ARCH_DIR=	${COMPILER_RT_SRCDIR}/lib/builtins/${LIBC_MACHINE_ARCH}
 .endif
 
 .PATH: ${COMPILER_RT_CPU_DIR}
@@ -166,7 +166,7 @@ GENERIC_SRCS+= \
 	GCDAProfiling.c \
 	PGOProfiling.c
 
-.if ${MACHINE_ARCH} == "powerpc"
+.if ${LIBC_MACHINE_ARCH} == "powerpc"
 GENERIC_SRCS+= \
 	fixtfdi.c \
 	fixunstfdi.c \