===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/cpp/Makefile,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- src/usr.bin/cpp/Makefile	2010/05/03 18:34:01	1.9
+++ src/usr.bin/cpp/Makefile	2010/05/10 18:20:31	1.10
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.9 2010/05/03 18:34:01 drahn Exp $
+#	$OpenBSD: Makefile,v 1.10 2010/05/10 18:20:31 drahn Exp $
 
 .include <bsd.own.mk>
 
@@ -7,13 +7,11 @@
 PROG=cpp
 SRCS=
 INSTALL_STRIP=
-USE_GCC3?="no"
-USE_GCC4?="no"
 
 cpp: cpp.sh
-.if ${USE_GCC3:L} == "yes"
+.if ${COMPILER_VERSION:L} == "gcc3"
 	sed -e 's/@GNUC@/-D__GNUC__/' -e 's/@dollaropt@//' ${.CURDIR}/cpp.sh >$@
-.elif ${USE_GCC4:L} == "yes"
+.elif ${COMPILER_VERSION:L} == "gcc4"
 	sed -e 's/@GNUC@//' -e 's/@dollaropt@//' ${.CURDIR}/cpp.sh >$@
 .else
 	sed -e 's/@GNUC@/-D__GNUC__/' -e 's/@dollaropt@/-$$/' ${.CURDIR}/cpp.sh >$@