diff options
Diffstat (limited to 'gnu')
| -rw-r--r-- | gnu/egcs/Makefile.bsd-wrapper | 12 | ||||
| -rw-r--r-- | gnu/lib/Makefile | 11 | ||||
| -rw-r--r-- | gnu/lib/libobjc/Makefile.bsd-wrapper | 13 | ||||
| -rw-r--r-- | gnu/usr.bin/Makefile | 9 | ||||
| -rw-r--r-- | gnu/usr.bin/cc/include/Makefile | 4 | ||||
| -rw-r--r-- | gnu/usr.bin/perl/Makefile.bsd-wrapper | 6 |
6 files changed, 29 insertions, 26 deletions
diff --git a/gnu/egcs/Makefile.bsd-wrapper b/gnu/egcs/Makefile.bsd-wrapper index 556881a6246..953c06eeb1e 100644 --- a/gnu/egcs/Makefile.bsd-wrapper +++ b/gnu/egcs/Makefile.bsd-wrapper @@ -1,17 +1,9 @@ -# $OpenBSD: Makefile.bsd-wrapper,v 1.9 2005/04/28 21:33:25 espie Exp $ +# $OpenBSD: Makefile.bsd-wrapper,v 1.10 2010/05/10 18:20:31 drahn Exp $ .include <bsd.own.mk> -USE_GCC3?=No -.if make(obj) +# Note that this Makefile is only used for make obj and GCC2 architectures. SUBDIR+= libio libf2c libstdc++ -.else -. if ${USE_GCC3:L} == "no" -SUBDIR+= libio libf2c libstdc++ -. else -SUBDIR+= -. endif -.endif # just so that the main directory will have a subdir, which simplifies # libf2c build 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) diff --git a/gnu/usr.bin/Makefile b/gnu/usr.bin/Makefile index bc31600029d..1a89636719e 100644 --- a/gnu/usr.bin/Makefile +++ b/gnu/usr.bin/Makefile @@ -1,14 +1,15 @@ -# $OpenBSD: Makefile,v 1.45 2007/03/23 02:17:52 ray Exp $ +# $OpenBSD: Makefile,v 1.46 2010/05/10 18:20:31 drahn Exp $ # $NetBSD: Makefile,v 1.35 1996/04/03 21:20:52 chuck Exp $ .include <bsd.own.mk> -USE_GCC3?=No .if make(obj) -SUBDIR+= gcc ../egcs/gcc +SUBDIR+= cc gcc ../egcs/gcc .else -. if ${USE_GCC3:L} == "yes" +. if ${COMPILER_VERSION:L} == "gcc3" SUBDIR+= gcc +. elif ${COMPILER_VERSION:L} == "gcc4" +SUBDIR+= cc . else SUBDIR+= ../egcs/gcc . endif diff --git a/gnu/usr.bin/cc/include/Makefile b/gnu/usr.bin/cc/include/Makefile index 65a37d80868..aa653abb955 100644 --- a/gnu/usr.bin/cc/include/Makefile +++ b/gnu/usr.bin/cc/include/Makefile @@ -1,5 +1,5 @@ # $FreeBSD: src/gnu/usr.bin/cc/include/Makefile,v 1.9.8.1 2009/04/15 03:14:26 kensmith Exp $ -# $OpenBSD: Makefile,v 1.6 2010/05/10 14:17:52 marco Exp $ +# $OpenBSD: Makefile,v 1.7 2010/05/10 18:20:31 drahn Exp $ .include <bsd.own.mk> @@ -33,7 +33,7 @@ depend: # Nothing here so far... .if !empty(INCS) -install: ${INCS} +install includes: ${INCS} ${INSTALL} -C -o ${BINOWN} -g ${LOCALEGRP} -m ${NONBINMODE} ${.ALLSRC} \ ${DESTDIR}/usr/include .else diff --git a/gnu/usr.bin/perl/Makefile.bsd-wrapper b/gnu/usr.bin/perl/Makefile.bsd-wrapper index d267907ff48..fee9c576cab 100644 --- a/gnu/usr.bin/perl/Makefile.bsd-wrapper +++ b/gnu/usr.bin/perl/Makefile.bsd-wrapper @@ -1,9 +1,9 @@ -# $OpenBSD: Makefile.bsd-wrapper,v 1.81 2010/02/03 20:49:00 miod Exp $ +# $OpenBSD: Makefile.bsd-wrapper,v 1.82 2010/05/10 18:20:31 drahn Exp $ # # Build wrapper for Perl 5.10.0 # -# For ``NOMAN'' and ``USE_GCC3'' +# For ``NOMAN'' and ``COMPILER_VERSION'' .include <bsd.own.mk> # There is no point in building a profiled libperl that is never used. @@ -15,7 +15,7 @@ TARGET_MACHINE_ARCH?= $(MACHINE_ARCH) # Perl builds with -fno-strict-aliasing, we want libperl to do the same CFLAGS+= -fno-strict-aliasing -.if ${USE_GCC3:L} == "yes" +.if ${COMPILER_VERSION:L} == "gcc3" || ${COMPILER_VERSION:L} == "gcc4" CFLAGS+= -fno-delete-null-pointer-checks .endif |