Index: lib/atf/libatf-c/Makefile
===================================================================
--- lib/atf/libatf-c/Makefile
+++ lib/atf/libatf-c/Makefile
@@ -28,6 +28,9 @@
 .include <src.opts.mk>
 .include <bsd.init.mk>
 
+ATF_BUILD_CC:=		${CC:[1]}
+ATF_BUILD_CPP:=		${CPP:[1]}
+ATF_BUILD_CXX:=		${CXX:[1]}
 ATF_BUILD_CFLAGS:=	${CFLAGS:M-[DILOWf]*}
 ATF_BUILD_CPPFLAGS:=	${CPPFLAGS:M-[DILOWf]*}
 ATF_BUILD_CXXFLAGS:=	${CXXFLAGS:M-[DILOWf]*}
@@ -41,11 +44,11 @@
 .PATH:		${ATF}/atf-c
 .PATH:		${ATF}/atf-c/detail
 
-CFLAGS+=	-DATF_BUILD_CC='"${CC}"'
+CFLAGS+=	-DATF_BUILD_CC='"${ATF_BUILD_CC}"'
 CFLAGS+=	-DATF_BUILD_CFLAGS='"${ATF_BUILD_CFLAGS}"'
-CFLAGS+=	-DATF_BUILD_CPP='"${CPP}"'
+CFLAGS+=	-DATF_BUILD_CPP='"${ATF_BUILD_CPP}"'
 CFLAGS+=	-DATF_BUILD_CPPFLAGS='"${ATF_BUILD_CPPFLAGS}"'
-CFLAGS+=	-DATF_BUILD_CXX='"${CXX}"'
+CFLAGS+=	-DATF_BUILD_CXX='"${ATF_BUILD_CXX}"'
 CFLAGS+=	-DATF_BUILD_CXXFLAGS='"${ATF_BUILD_CXXFLAGS}"'
 CFLAGS+=	-I${ATF}
 CFLAGS+=	-I${.CURDIR}