diff options
| author | Miod Vallat <miod@cvs.openbsd.org> | 2013-08-06 19:11:54 +0000 |
|---|---|---|
| committer | Miod Vallat <miod@cvs.openbsd.org> | 2013-08-06 19:11:54 +0000 |
| commit | 81a80cf18dfb0d2c181f37070df4c0bcee447b6f (patch) | |
| tree | 2b540bea449476e38cd4184199337f3139843d9a /include | |
| parent | 4deeb07029db0412704e811b0e924993fe415641 (diff) | |
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 'include')
| -rw-r--r-- | include/Makefile | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/include/Makefile b/include/Makefile index dd6f5c67387..6b90cf7d342 100644 --- a/include/Makefile +++ b/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 |