diff options
Diffstat (limited to 'gnu/lib')
| -rw-r--r-- | gnu/lib/Makefile | 11 | ||||
| -rw-r--r-- | gnu/lib/libobjc/Makefile.bsd-wrapper | 13 |
2 files changed, 17 insertions, 7 deletions
diff --git a/gnu/lib/Makefile b/gnu/lib/Makefile index 62cd84c74d2..8d69bb9c058 100644 --- a/gnu/lib/Makefile +++ b/gnu/lib/Makefile @@ -1,13 +1,16 @@ -# $OpenBSD: Makefile,v 1.12 2005/04/28 21:30:13 espie Exp $ +# $OpenBSD: Makefile,v 1.13 2010/05/10 18:20:31 drahn Exp $ .include <bsd.own.mk> -USE_GCC3?=No .if make(obj) -SUBDIR+=libiberty libobjc libstdc++ ../egcs libreadline libf2c +SUBDIR+=libiberty libobjc libstdc++ ../egcs libreadline libf2c \ +libstdc++-v3 ../usr.bin/cc/libobjc .else -. if ${USE_GCC3:L} == "yes" +. if ${COMPILER_VERSION:L} == "gcc3" SUBDIR+=libiberty libobjc libstdc++ libreadline libf2c +. elif ${COMPILER_VERSION:L} == "gcc4" +# XXX make sure we build libobjc & libstdc++-v3 from gcc4 +SUBDIR+=libiberty libreadline libstdc++-v3 ../usr.bin/cc/libobjc . else SUBDIR+=libiberty libobjc ../egcs libreadline . endif diff --git a/gnu/lib/libobjc/Makefile.bsd-wrapper b/gnu/lib/libobjc/Makefile.bsd-wrapper index ca0a4569357..536a4edca25 100644 --- a/gnu/lib/libobjc/Makefile.bsd-wrapper +++ b/gnu/lib/libobjc/Makefile.bsd-wrapper @@ -1,16 +1,23 @@ -# $OpenBSD: Makefile.bsd-wrapper,v 1.5 2007/07/23 17:24:06 kurt Exp $ +# $OpenBSD: Makefile.bsd-wrapper,v 1.6 2010/05/10 18:20:31 drahn Exp $ LIB= objc LIBIBERTY_INCLUDES=${.CURDIR}/../libiberty/include .include <bsd.own.mk> -.if ${USE_GCC3:L} == "yes" +.if make(obj) +.else +. if ${COMPILER_VERSION:L} == "gcc3" GCCDIR= $(.CURDIR)/../../usr.bin/gcc GCCSRCDIR=${GCCDIR}/gcc -.else +. 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 +. endif .endif .if defined(MAKEOBJDIR) |