summaryrefslogtreecommitdiffstats
path: root/usr.bin/cpp
diff options
context:
space:
mode:
authormiod <miod@openbsd.org>2013-08-06 19:11:53 +0000
committermiod <miod@openbsd.org>2013-08-06 19:11:53 +0000
commit88919d82941730befd871059e1eb8dffb94cfd62 (patch)
tree66ecdfd8b2eb1d4177a23b5654b0682e36bf1ffe /usr.bin/cpp
parentSwitch vax to gcc 3.3.6. (diff)
downloadwireguard-openbsd-88919d82941730befd871059e1eb8dffb94cfd62.tar.xz
wireguard-openbsd-88919d82941730befd871059e1eb8dffb94cfd62.zip
Remove support for COMPILER_VERSION == gcc2.
Change the logic depending upon COMPILER_VERSION everywhere, to assume gcc4 is the norm and to explicitely test for gcc3 when a different behaviour is required. No functional change intended. Be sure to `make install' in share/mk before attempting to do anything.
Diffstat (limited to 'usr.bin/cpp')
-rw-r--r--usr.bin/cpp/Makefile6
1 files changed, 2 insertions, 4 deletions
diff --git a/usr.bin/cpp/Makefile b/usr.bin/cpp/Makefile
index d783b13bb07..4cd42f4706d 100644
--- a/usr.bin/cpp/Makefile
+++ b/usr.bin/cpp/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.10 2010/05/10 18:20:31 drahn Exp $
+# $OpenBSD: Makefile,v 1.11 2013/08/06 19:11:53 miod Exp $
.include <bsd.own.mk>
@@ -11,10 +11,8 @@ INSTALL_STRIP=
cpp: cpp.sh
.if ${COMPILER_VERSION:L} == "gcc3"
sed -e 's/@GNUC@/-D__GNUC__/' -e 's/@dollaropt@//' ${.CURDIR}/cpp.sh >$@
-.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 >$@
+ sed -e 's/@GNUC@//' -e 's/@dollaropt@//' ${.CURDIR}/cpp.sh >$@
.endif
.include <bsd.prog.mk>