Browse Source

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.
OPENBSD_5_5
miod 11 years ago
parent
commit
bb0b588c73
1 changed files with 2 additions and 5 deletions
  1. +2
    -5
      src/include/Makefile

+ 2
- 5
src/include/Makefile View File

@ -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 $ # $NetBSD: Makefile,v 1.59 1996/05/15 21:36:43 jtc Exp $
# @(#)Makefile 5.45.1.1 (Berkeley) 5/6/91 # @(#)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" .if ${COMPILER_VERSION:L} == "gcc3"
RDIRS+= ../gnu/usr.bin/gcc ../gnu/lib/libobjc RDIRS+= ../gnu/usr.bin/gcc ../gnu/lib/libobjc
PRDIRS+= ../gnu/lib/libstdc++ PRDIRS+= ../gnu/lib/libstdc++
.elif ${COMPILER_VERSION:L} == "gcc4"
.else
RDIRS+= ../gnu/usr.bin/cc/libobjc RDIRS+= ../gnu/usr.bin/cc/libobjc
PRDIRS+= ../gnu/lib/libstdc++-v3 PRDIRS+= ../gnu/lib/libstdc++-v3
RDIRS+= ../gnu/usr.bin/cc/include RDIRS+= ../gnu/usr.bin/cc/include
.else
RDIRS+= ../gnu/egcs/libio ../gnu/egcs/libstdc++ \
../gnu/lib/libobjc ../gnu/egcs/gcc
.endif .endif
# prereq implies includes # prereq implies includes


Loading…
Cancel
Save