diff options
| author | Ingo Schwarze <schwarze@cvs.openbsd.org> | 2011-10-30 20:57:07 +0000 |
|---|---|---|
| committer | Ingo Schwarze <schwarze@cvs.openbsd.org> | 2011-10-30 20:57:07 +0000 |
| commit | 88e7b9700fba17868e6f3a26525f705b8d72b31b (patch) | |
| tree | ef8ae945c87878eae4b7d20b30aba3ab3c5ee57b | |
| parent | cb00ea8cd88dee0b31d269cefd0339932e02b50b (diff) | |
Always install addr2line(1), objcopy(1), and readelf(1), even on
architectures with !ELF_TOOLCHAIN && !USING_NEW_BINUTILS (like vax, m68k).
There is no need to reach around from usr.bin/Makefile into binutils;
we always descend into either binutils or binutils-2.17.
All is fine so far with binutils-2.17 since ia64 has USING_NEW_BINUTILS.
tested on vax and ok deraadt@
| -rw-r--r-- | gnu/usr.bin/Makefile | 8 | ||||
| -rw-r--r-- | gnu/usr.bin/binutils/Makefile.bsd-wrapper | 12 |
2 files changed, 7 insertions, 13 deletions
diff --git a/gnu/usr.bin/Makefile b/gnu/usr.bin/Makefile index 0396760635f..07d09510b11 100644 --- a/gnu/usr.bin/Makefile +++ b/gnu/usr.bin/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.49 2011/09/22 22:21:13 schwarze Exp $ +# $OpenBSD: Makefile,v 1.50 2011/10/30 20:57:06 schwarze Exp $ # $NetBSD: Makefile,v 1.35 1996/04/03 21:20:52 chuck Exp $ .include <bsd.own.mk> @@ -36,12 +36,6 @@ maninstall: gcc/protoize.1 ${DESTDIR}${MANDIR}1/protoize.1 @rm -f ${DESTDIR}${MANDIR}1/unprotoize.1 ln ${DESTDIR}${MANDIR}1/protoize.1 ${DESTDIR}${MANDIR}1/unprotoize.1 -.elif ${ELF_TOOLCHAIN:L} == "yes" -maninstall: -.for cmd in addr2line objcopy readelf - ${INSTALL} ${INSTALL_COPY} -o ${MANOWN} -g ${MANGRP} -m ${MANMODE} \ - binutils/binutils/doc/${cmd}.1 ${DESTDIR}${MANDIR}1/${cmd}.1 -.endfor .endif .include <bsd.subdir.mk> diff --git a/gnu/usr.bin/binutils/Makefile.bsd-wrapper b/gnu/usr.bin/binutils/Makefile.bsd-wrapper index af01489e76a..047605b1128 100644 --- a/gnu/usr.bin/binutils/Makefile.bsd-wrapper +++ b/gnu/usr.bin/binutils/Makefile.bsd-wrapper @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile.bsd-wrapper,v 1.75 2011/07/06 04:10:32 schwarze Exp $ +# $OpenBSD: Makefile.bsd-wrapper,v 1.76 2011/10/30 20:57:06 schwarze Exp $ NEW_BINUTILS=alpha amd64 arm hppa hppa64 i386 mips64 powerpc sh sparc sparc64 @@ -20,7 +20,9 @@ PREFIX=/usr MANDIR=${PREFIX}/share/man/man .endif -MAN= binutils/doc/objdump.1 c++filt.1 +MAN= binutils/doc/addr2line.1 binutils/doc/objcopy.1 \ + binutils/doc/objdump.1 binutils/doc/readelf.1 \ + c++filt.1 CONF_SUBDIRS+= gdb SUBDIRS+= gdb @@ -31,10 +33,8 @@ MAN+= gdb/gdb.1 SUBDIRS+= binutils ld gas CONF_SUBDIRS+= binutils ld gas INST_SUBDIRS+= binutils ld gas -MAN+= binutils/doc/addr2line.1 binutils/doc/ar.1 \ - binutils/doc/objcopy.1 binutils/doc/ranlib.1 \ - binutils/doc/readelf.1 binutils/doc/strings.1 \ - binutils/doc/strip.1 \ +MAN+= binutils/doc/ar.1 binutils/doc/ranlib.1 \ + binutils/doc/strings.1 binutils/doc/strip.1 \ gas/doc/as.1 ld/ld.1 . else CONF_SUBDIRS=${SUBDIRS} |