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 /gnu/lib | |
| 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 'gnu/lib')
| -rw-r--r-- | gnu/lib/Makefile | 9 | ||||
| -rw-r--r-- | gnu/lib/libobjc/Makefile.bsd-wrapper | 9 |
2 files changed, 5 insertions, 13 deletions
diff --git a/gnu/lib/Makefile b/gnu/lib/Makefile index d43d4fbed96..5aa9429368e 100644 --- a/gnu/lib/Makefile +++ b/gnu/lib/Makefile @@ -1,20 +1,17 @@ -# $OpenBSD: Makefile,v 1.16 2011/11/21 01:36:18 jsg Exp $ +# $OpenBSD: Makefile,v 1.17 2013/08/06 19:11:53 miod Exp $ .include <bsd.own.mk> SUBDIR+=libiberty libreadline .if make(obj) -SUBDIR+=libobjc libstdc++ ../egcs \ -libstdc++-v3 libsupc++-v3 ../usr.bin/cc/libobjc +SUBDIR+=libobjc libstdc++ libstdc++-v3 libsupc++-v3 ../usr.bin/cc/libobjc .else . if ${COMPILER_VERSION:L} == "gcc3" SUBDIR+=libobjc libstdc++ -. elif ${COMPILER_VERSION:L} == "gcc4" +. else # XXX make sure we build libobjc & libstdc++-v3 from gcc4 SUBDIR+=../usr.bin/cc/libobjc SUBDIR+=libstdc++-v3 libsupc++-v3 -. elif ${COMPILER_VERSION:L} == "gcc2" -SUBDIR+=libobjc ../egcs . endif .endif diff --git a/gnu/lib/libobjc/Makefile.bsd-wrapper b/gnu/lib/libobjc/Makefile.bsd-wrapper index bd5073ef425..2c2ec019358 100644 --- a/gnu/lib/libobjc/Makefile.bsd-wrapper +++ b/gnu/lib/libobjc/Makefile.bsd-wrapper @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile.bsd-wrapper,v 1.7 2011/06/24 22:47:51 deraadt Exp $ +# $OpenBSD: Makefile.bsd-wrapper,v 1.8 2013/08/06 19:11:53 miod Exp $ LIB= objc @@ -10,13 +10,8 @@ LIBIBERTY_INCLUDES=${.CURDIR}/../libiberty/include . if ${COMPILER_VERSION:L} == "gcc3" GCCDIR= $(.CURDIR)/../../usr.bin/gcc GCCSRCDIR=${GCCDIR}/gcc -. elif ${COMPILER_VERSION:L} == "gcc2" -GCCDIR= $(.CURDIR)/../../egcs/gcc -GCCSRCDIR=${GCCDIR} -. elif ${COMPILER_VERSION:L} == "gcc4" -error GCC4 should not build gnu/lib/libobjc . else -error unknown compiler +error wrong compiler . endif .endif |