diff options
| -rw-r--r-- | gnu/egcs/Makefile.bsd-wrapper | 4 | ||||
| -rw-r--r-- | gnu/egcs/gcc/Makefile.bsd-wrapper | 19 | ||||
| -rw-r--r-- | gnu/lib/Makefile | 6 | ||||
| -rw-r--r-- | gnu/usr.bin/gcc/Makefile.bsd-wrapper | 11 | ||||
| -rw-r--r-- | include/Makefile | 10 |
5 files changed, 14 insertions, 36 deletions
diff --git a/gnu/egcs/Makefile.bsd-wrapper b/gnu/egcs/Makefile.bsd-wrapper index 953c06eeb1e..00dea045df7 100644 --- a/gnu/egcs/Makefile.bsd-wrapper +++ b/gnu/egcs/Makefile.bsd-wrapper @@ -1,9 +1,9 @@ -# $OpenBSD: Makefile.bsd-wrapper,v 1.10 2010/05/10 18:20:31 drahn Exp $ +# $OpenBSD: Makefile.bsd-wrapper,v 1.11 2010/05/25 00:24:58 espie Exp $ .include <bsd.own.mk> # Note that this Makefile is only used for make obj and GCC2 architectures. -SUBDIR+= libio libf2c libstdc++ +SUBDIR+= libio libstdc++ # just so that the main directory will have a subdir, which simplifies # libf2c build diff --git a/gnu/egcs/gcc/Makefile.bsd-wrapper b/gnu/egcs/gcc/Makefile.bsd-wrapper index d2914bbef6e..93acc73d76c 100644 --- a/gnu/egcs/gcc/Makefile.bsd-wrapper +++ b/gnu/egcs/gcc/Makefile.bsd-wrapper @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile.bsd-wrapper,v 1.22 2009/03/09 21:07:06 miod Exp $ +# $OpenBSD: Makefile.bsd-wrapper,v 1.23 2010/05/25 00:24:58 espie Exp $ MAN= cpp.1 gcc.1 protoize.1 gcov.1 MLINKS+= gcc.1 cc.1 @@ -7,10 +7,9 @@ MLINKS+= protoize.1 unprotoize.1 .if defined(BOOTSTRAP) LANGUAGES=--enable-languages=c .else -LANGUAGES=--enable-languages='c,c++,objc,f77' -MAN+= cp/g++.1 f/g77.1 +LANGUAGES=--enable-languages='c,c++,objc' +MAN+= cp/g++.1 MLINKS+= g++.1 c++.1 -MLINKS+= g77.1 f77.1 BEFOREMAN= config.status .endif @@ -121,23 +120,11 @@ install: maninstall target_path install chown -R ${BINOWN}:${BINGRP} ${DESTDIR}/usr/lib/gcc-lib chmod -R a+rX ${DESTDIR}/usr/lib/gcc-lib -# if [ -e ${DESTDIR}/usr/lib/libf2c.a ]; then \ -# chown ${BINOWN}:${BINGRP} ${DESTDIR}/usr/lib/libf2c.a; \ -# chmod 444 ${DESTDIR}/usr/lib/libf2c.a; \ -# fi - if [ -e ${DESTDIR}/usr/include/f2c.h ]; then \ - chown ${BINOWN}:${BINGRP} ${DESTDIR}/usr/include/f2c.h; \ - chmod 444 ${DESTDIR}/usr/include/f2c.h; \ - fi ${INSTALL} ${INSTALL_COPY} ${INSTALL_STRIP} -m 755 cpp \ ${DESTDIR}/usr/libexec/cpp ${INSTALL} ${INSTALL_COPY} ${INSTALL_STRIP} -m 755 xgcc \ ${DESTDIR}/usr/bin/gcc ln -f ${DESTDIR}/usr/bin/gcc ${DESTDIR}/usr/bin/cc - [ -f ${DESTDIR}/usr/bin/g77 ] && \ - ln -f ${DESTDIR}/usr/bin/g77 ${DESTDIR}/usr/bin/f77 -# ln -fs `cat target-path`/cpp \ -# ${DESTDIR}/usr/libexec for i in ${FAKE_FILES}; do \ touch ${DESTDIR}$$i; \ done diff --git a/gnu/lib/Makefile b/gnu/lib/Makefile index 451b0272292..2ae6f2c03a5 100644 --- a/gnu/lib/Makefile +++ b/gnu/lib/Makefile @@ -1,13 +1,13 @@ -# $OpenBSD: Makefile,v 1.14 2010/05/15 08:28:18 robert Exp $ +# $OpenBSD: Makefile,v 1.15 2010/05/25 00:24:58 espie Exp $ .include <bsd.own.mk> .if make(obj) -SUBDIR+=libiberty libobjc libstdc++ ../egcs libreadline libf2c \ +SUBDIR+=libiberty libobjc libstdc++ ../egcs libreadline \ libstdc++-v3 libsupc++-v3 ../usr.bin/cc/libobjc .else . if ${COMPILER_VERSION:L} == "gcc3" -SUBDIR+=libiberty libobjc libstdc++ libreadline libf2c +SUBDIR+=libiberty libobjc libstdc++ libreadline . elif ${COMPILER_VERSION:L} == "gcc4" # XXX make sure we build libobjc & libstdc++-v3 from gcc4 SUBDIR+=libiberty libreadline ../usr.bin/cc/libobjc diff --git a/gnu/usr.bin/gcc/Makefile.bsd-wrapper b/gnu/usr.bin/gcc/Makefile.bsd-wrapper index 4905a2064dc..c9bbda6ba40 100644 --- a/gnu/usr.bin/gcc/Makefile.bsd-wrapper +++ b/gnu/usr.bin/gcc/Makefile.bsd-wrapper @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile.bsd-wrapper,v 1.59 2009/07/26 22:51:28 kurt Exp $ +# $OpenBSD: Makefile.bsd-wrapper,v 1.60 2010/05/25 00:24:58 espie Exp $ MAN= gcc.1 cpp.1 gcov.1 protoize.1 MLINKS+= protoize.1 unprotoize.1 @@ -8,10 +8,8 @@ BINDIR=/usr/bin .if defined(BOOTSTRAP) LANGUAGES=--enable-languages=c .else -LANGUAGES=--enable-languages='c,c++,objc,f77' -MAN+= f/g77.1 +LANGUAGES=--enable-languages='c,c++,objc' MLINKS+= gcc.1 g++.1 gcc.1 c++.1 -MLINKS+= g77.1 f77.1 .endif V=3.3.5 @@ -152,11 +150,6 @@ install: maninstall target_path ${INSTALL} ${INSTALL_COPY} ${INSTALL_STRIP} -m 755 xgcc \ ${DESTDIR}/usr/bin/gcc ln -f ${DESTDIR}/usr/bin/gcc ${DESTDIR}/usr/bin/cc - if [ -f ${DESTDIR}/usr/bin/g77 ]; then \ - ln -f ${DESTDIR}/usr/bin/g77 ${DESTDIR}/usr/bin/f77; \ - fi -# ln -fs `cat target-path`/cpp \ -# ${DESTDIR}/usr/libexec clean cleandir: -@if [ -e Makefile ]; then ${MAKE} distclean; fi diff --git a/include/Makefile b/include/Makefile index 31b08942a3b..b8709311ea6 100644 --- a/include/Makefile +++ b/include/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.154 2010/05/10 18:20:31 drahn Exp $ +# $OpenBSD: Makefile,v 1.155 2010/05/25 00:24:58 espie Exp $ # $NetBSD: Makefile,v 1.59 1996/05/15 21:36:43 jtc Exp $ # @(#)Makefile 5.45.1.1 (Berkeley) 5/6/91 @@ -58,17 +58,15 @@ WDIRS= ../usr.sbin/httpd PWDIRS= .if ${COMPILER_VERSION:L} == "gcc3" -WDIRS+= ../gnu/lib/libstdc++ ../gnu/usr.bin/gcc ../gnu/lib/libobjc \ - ../gnu/lib/libf2c -PWDIRS+= ../gnu/lib/libstdc++ ../gnu/lib/libf2c +WDIRS+= ../gnu/lib/libstdc++ ../gnu/usr.bin/gcc ../gnu/lib/libobjc +PWDIRS+= ../gnu/lib/libstdc++ .elif ${COMPILER_VERSION:L} == "gcc4" RDIRS+= ../gnu/lib/libstdc++-v3 ../gnu/usr.bin/cc/libobjc PRDIRS+= ../gnu/lib/libstdc++-v3 RDIRS+= ../gnu/usr.bin/cc/include .else WDIRS+= ../gnu/egcs/libio ../gnu/egcs/libstdc++ \ - ../gnu/egcs/libf2c ../gnu/lib/libobjc ../gnu/egcs/gcc -PWDIRS+= ../gnu/egcs/libf2c + ../gnu/lib/libobjc ../gnu/egcs/gcc .endif NOOBJ= noobj |