From bb0b588c732f0a918748210b1e67ad7c8a81b601 Mon Sep 17 00:00:00 2001
From: miod <>
Date: Tue, 6 Aug 2013 19:11:53 +0000
Subject: [PATCH] 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.

---
 src/include/Makefile | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/src/include/Makefile b/src/include/Makefile
index dd6f5c67..6b90cf7d 100644
--- a/src/include/Makefile
+++ b/src/include/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.171 2013/06/19 19:47:48 robert Exp $
+#	$OpenBSD: Makefile,v 1.172 2013/08/06 19:11:53 miod Exp $
 #	$NetBSD: Makefile,v 1.59 1996/05/15 21:36:43 jtc Exp $
 
 #	@(#)Makefile	5.45.1.1 (Berkeley) 5/6/91
@@ -54,13 +54,10 @@ RDIRS=	../lib/librthread ../lib/libcompat ../lib/libcurses \
 .if ${COMPILER_VERSION:L} == "gcc3"
 RDIRS+= ../gnu/usr.bin/gcc ../gnu/lib/libobjc
 PRDIRS+= ../gnu/lib/libstdc++
-.elif ${COMPILER_VERSION:L} == "gcc4"
+.else
 RDIRS+= ../gnu/usr.bin/cc/libobjc
 PRDIRS+= ../gnu/lib/libstdc++-v3
 RDIRS+= ../gnu/usr.bin/cc/include
-.else
-RDIRS+= ../gnu/egcs/libio ../gnu/egcs/libstdc++ \
-	../gnu/lib/libobjc ../gnu/egcs/gcc
 .endif
 
 # prereq implies includes