diff options
| -rw-r--r-- | Makefile.cross | 10 | ||||
| -rw-r--r-- | gnu/usr.bin/Makefile | 10 | ||||
| -rw-r--r-- | gnu/usr.bin/binutils/Makefile.bsd-wrapper | 35 | ||||
| -rw-r--r-- | share/mk/bsd.own.mk | 9 |
4 files changed, 6 insertions, 58 deletions
diff --git a/Makefile.cross b/Makefile.cross index 63978279485..ec677bc105f 100644 --- a/Makefile.cross +++ b/Makefile.cross @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile.cross,v 1.76 2015/05/28 18:23:11 miod Exp $ +# $OpenBSD: Makefile.cross,v 1.77 2015/06/01 17:36:17 miod Exp $ cross-tools: cross-includes cross-binutils cross-gcc cross-lib cross-distrib: cross-tools cross-bin cross-share cross-sys cross-etc-root-var @@ -86,12 +86,6 @@ COMPILER_VERSION=gcc3 COMPILER_VERSION=gcc4 .endif -.if !empty(BINUTILS215_ARCH:M${_arch}) -BINUTILS_VERSION=binutils -.else -BINUTILS_VERSION=binutils-2.17 -.endif - .if !empty(PIE_ARCH:M${_arch}) NOPIE_FLAGS=-fno-pie NOPIE_LDFLAGS=-nopie @@ -103,7 +97,7 @@ PIE_DEFAULT= BINUTILS= ar as gasp ld nm objcopy objdump ranlib readelf size \ strings strip -BINUTILS_DIR=gnu/usr.bin/${BINUTILS_VERSION} +BINUTILS_DIR=gnu/usr.bin/binutils-2.17 .endfor # no libcrypto.... these won't build diff --git a/gnu/usr.bin/Makefile b/gnu/usr.bin/Makefile index 2b6dfa773a7..a887a9b88cf 100644 --- a/gnu/usr.bin/Makefile +++ b/gnu/usr.bin/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.55 2014/07/16 01:23:39 deraadt Exp $ +# $OpenBSD: Makefile,v 1.56 2015/06/01 17:36:19 miod Exp $ # $NetBSD: Makefile,v 1.35 1996/04/03 21:20:52 chuck Exp $ .include <bsd.own.mk> @@ -14,15 +14,9 @@ SUBDIR+= cc .endif SUBDIR+= cxxfilt cvs -.if make(obj) -SUBDIR+= binutils binutils-2.17 -.else # binutils-2.17 needs to build gdb in binutils at the moment -.if ${BINUTILS_VERSION} == "binutils-2.17" SUBDIR+= binutils -.endif -SUBDIR+= ${BINUTILS_VERSION} -.endif +SUBDIR+= binutils-2.17 # Do these last; texinfo builds the info 'dir' file, perl must be after binutils SUBDIR+= perl texinfo diff --git a/gnu/usr.bin/binutils/Makefile.bsd-wrapper b/gnu/usr.bin/binutils/Makefile.bsd-wrapper index d491db9a81f..48f30cff0de 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.82 2013/07/05 21:29:51 miod Exp $ +# $OpenBSD: Makefile.bsd-wrapper,v 1.83 2015/06/01 17:36:19 miod Exp $ .include <bsd.own.mk> @@ -10,38 +10,11 @@ PREFIX=/usr MANDIR=${PREFIX}/share/man/man .endif -.if ${BINUTILS_VERSION} == "binutils-2.17" - SUBDIRS= opcodes bfd gdb CONF_SUBDIRS= ${SUBDIRS} INST_SUBDIRS= gdb MAN= gdb/gdb.1 -.else - -SUBDIRS= opcodes bfd -CONF_SUBDIRS= opcodes bfd - -MAN= binutils/doc/addr2line.1 binutils/doc/objcopy.1 \ - binutils/doc/objdump.1 binutils/doc/readelf.1 \ - c++filt.1 - -.if !defined(TARGET_ARCH) && !defined(BOOTSTRAP) -CONF_SUBDIRS+= gdb -SUBDIRS+= gdb -INST_SUBDIRS+= gdb -MAN+= gdb/gdb.1 -.endif - -SUBDIRS+= binutils ld gas -CONF_SUBDIRS+= binutils ld gas -INST_SUBDIRS+= binutils ld gas -MAN+= binutils/doc/ar.1 binutils/doc/ranlib.1 \ - binutils/doc/strings.1 binutils/doc/strip.1 \ - gas/doc/as.1 ld/ld.1 - -.endif - # Used by the GNU Makefile ALL_MODULES=${SUBDIRS:S/^/all-/g} CONFIGURE_MODULES=${CONF_SUBDIRS:S/^/configure-/g} @@ -93,12 +66,6 @@ do-config: .USE cd ${.OBJDIR} && \ ${MAKE} ${CONFIGURE_MODULES} -gas/doc/as.1: config.status - cd ${.OBJDIR}/gas/doc && ${MAKE} as.1 - -ld/ld.1: config.status - cd ${.OBJDIR}/ld && ${MAKE} ld.1 - config: do-config .ifndef GLOBAL_AUTOCONF_CACHE -rm -f config.cache diff --git a/share/mk/bsd.own.mk b/share/mk/bsd.own.mk index 04399ed446a..069357449d6 100644 --- a/share/mk/bsd.own.mk +++ b/share/mk/bsd.own.mk @@ -1,4 +1,4 @@ -# $OpenBSD: bsd.own.mk,v 1.167 2015/06/01 17:35:24 miod Exp $ +# $OpenBSD: bsd.own.mk,v 1.168 2015/06/01 17:36:19 miod Exp $ # $NetBSD: bsd.own.mk,v 1.24 1996/04/13 02:08:09 thorpej Exp $ # Host-specific overrides @@ -18,7 +18,6 @@ YP?= yes DEBUGLIBS?= no GCC3_ARCH=m88k vax -BINUTILS215_ARCH= # arm needs binutils-2.17, which still lacks W^X support # sparc has not been tried @@ -34,12 +33,6 @@ COMPILER_VERSION?=gcc3 COMPILER_VERSION?=gcc4 .endif -.if !empty(BINUTILS215_ARCH:M${_arch}) -BINUTILS_VERSION=binutils -.else -BINUTILS_VERSION=binutils-2.17 -.endif - .if !empty(STATICPIE_ARCH:M${_arch}) STATICPIE?=-pie .endif |