diff options
Diffstat (limited to 'gnu')
| -rw-r--r-- | gnu/lib/Makefile | 9 | ||||
| -rw-r--r-- | gnu/lib/libobjc/Makefile.bsd-wrapper | 9 | ||||
| -rw-r--r-- | gnu/usr.bin/Makefile | 8 | ||||
| -rw-r--r-- | gnu/usr.bin/perl/Makefile.bsd-wrapper | 6 |
4 files changed, 10 insertions, 22 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 diff --git a/gnu/usr.bin/Makefile b/gnu/usr.bin/Makefile index a3ab6eb6e4b..52f88f1ae53 100644 --- a/gnu/usr.bin/Makefile +++ b/gnu/usr.bin/Makefile @@ -1,17 +1,15 @@ -# $OpenBSD: Makefile,v 1.53 2013/07/05 21:29:51 miod Exp $ +# $OpenBSD: Makefile,v 1.54 2013/08/06 19:11:53 miod Exp $ # $NetBSD: Makefile,v 1.35 1996/04/03 21:20:52 chuck Exp $ .include <bsd.own.mk> .if make(obj) -SUBDIR+= cc gcc ../egcs/gcc +SUBDIR+= cc gcc .else . if ${COMPILER_VERSION:L} == "gcc3" SUBDIR+= gcc -. elif ${COMPILER_VERSION:L} == "gcc4" +. else SUBDIR+= cc -. elif ${COMPILER_VERSION:L} == "gcc2" -SUBDIR+= ../egcs/gcc . endif .endif diff --git a/gnu/usr.bin/perl/Makefile.bsd-wrapper b/gnu/usr.bin/perl/Makefile.bsd-wrapper index 539c1421f24..9d737113278 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.91 2013/03/29 20:59:04 miod Exp $ +# $OpenBSD: Makefile.bsd-wrapper,v 1.92 2013/08/06 19:11:53 miod Exp $ # # Build wrapper for Perl 5.16.2 # -# For ``NOMAN'' and ``COMPILER_VERSION'' +# For ``NOMAN'' .include <bsd.own.mk> # There is no point in building a profiled libperl that is never used. @@ -13,9 +13,7 @@ TARGET_MACHINE_ARCH?= $(MACHINE_ARCH) # Perl builds with -fno-strict-aliasing, we want libperl to do the same CFLAGS+= -fno-strict-aliasing -.if ${COMPILER_VERSION:L} == "gcc3" || ${COMPILER_VERSION:L} == "gcc4" CFLAGS+= -fno-delete-null-pointer-checks -.endif CONFIGURE_ARGS= -dsE -Dopenbsd_distribution=defined -Dccflags='-DNO_LOCALE_NUMERIC -DNO_LOCALE_COLLATE' |