Let platforms configured to use binutils 2.17 still recurse into the binutils

2.15 directory, but only to build gdb.
ok deraadt@ espie@

3 files changed, 27 insertions, 11 deletions

diff --git a/gnu/usr.bin/Makefile b/gnu/usr.bin/Makefile
index 0b0c5b11ad4..8ac1adc1d15 100644
--- a/gnu/usr.bin/Makefile
+++ b/gnu/usr.bin/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.51 2011/11/21 01:36:18 jsg Exp $
+#	$OpenBSD: Makefile,v 1.52 2013/03/10 21:06:23 miod Exp $
 #	$NetBSD: Makefile,v 1.35 1996/04/03 21:20:52 chuck Exp $
 
 .include <bsd.own.mk>
@@ -19,6 +19,10 @@ SUBDIR+=	cxxfilt cvs lynx
 .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
 
diff --git a/gnu/usr.bin/binutils-2.17/Makefile.bsd-wrapper b/gnu/usr.bin/binutils-2.17/Makefile.bsd-wrapper
index 8b53e943563..2334e1fd3de 100644
--- a/gnu/usr.bin/binutils-2.17/Makefile.bsd-wrapper
+++ b/gnu/usr.bin/binutils-2.17/Makefile.bsd-wrapper
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile.bsd-wrapper,v 1.5 2013/01/05 20:03:06 miod Exp $
+#	$OpenBSD: Makefile.bsd-wrapper,v 1.6 2013/03/10 21:06:23 miod Exp $
 
 .include <bsd.own.mk>
 
@@ -17,7 +17,7 @@ MAN=		binutils/doc/addr2line.1 binutils/doc/objcopy.1 \
 		binutils/doc/objdump.1 binutils/doc/readelf.1 \
 		c++filt.1
 
-#### gdb comes from other binutils !?!?!
+#### gdb comes from older binutils at the moment
 ###CONF_SUBDIRS+=      gdb
 ###SUBDIRS+=   gdb
 ###INST_SUBDIRS+=      gdb
@@ -28,9 +28,8 @@ 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
-# no as or ld manual ??? 
-#		gas/doc/as.1	ld/ld.1
+		binutils/doc/strings.1 binutils/doc/strip.1 \
+		gas/doc/as.1	ld/ld.1
 .  else
 CONF_SUBDIRS=${SUBDIRS}
 CONF_SUBDIRS+= binutils
diff --git a/gnu/usr.bin/binutils/Makefile.bsd-wrapper b/gnu/usr.bin/binutils/Makefile.bsd-wrapper
index 5703c49f859..73444a7857e 100644
--- a/gnu/usr.bin/binutils/Makefile.bsd-wrapper
+++ b/gnu/usr.bin/binutils/Makefile.bsd-wrapper
@@ -1,10 +1,7 @@
-#	$OpenBSD: Makefile.bsd-wrapper,v 1.79 2013/01/05 20:03:06 miod Exp $
+#	$OpenBSD: Makefile.bsd-wrapper,v 1.80 2013/03/10 21:06:23 miod Exp $
 
 .include <bsd.own.mk>
 
-SUBDIRS=	opcodes bfd
-CONF_SUBDIRS=	opcodes bfd
-
 CFLAGS+=	${PIE_DEFAULT}
 # This allows moving the whole binutils installation around for 
 # testing purposes
@@ -13,14 +10,28 @@ 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)
 CONF_SUBDIRS+=	gdb
 SUBDIRS+=	gdb
 INST_SUBDIRS+=	gdb
 MAN+=		gdb/gdb.1
+.endif
 
 .if ${ELF_TOOLCHAIN:L} == "yes"
 SUBDIRS+=	binutils ld gas
@@ -34,6 +45,8 @@ CONF_SUBDIRS=${SUBDIRS}
 CONF_SUBDIRS+= binutils
 .endif
 
+.endif
+
 # Used by the GNU Makefile
 ALL_MODULES=${SUBDIRS:S/^/all-/g}
 CONFIGURE_MODULES=${CONF_SUBDIRS:S/^/configure-/g}
@@ -116,7 +129,7 @@ install: maninstall
 	    INSTALL_PROGRAM='install -c -S' \
 	    INSTALL_INFO_HOST_MODULES='${INSTALL_INFO_HOST_MODULES}' \
 	      install install-info
-.if ${ELF_TOOLCHAIN:L} != "yes"
+.if ${ELF_TOOLCHAIN:L} != "yes" && ${BINUTILS_VERSION} != "binutils-2.17"
 	cd ${.OBJDIR}/binutils && \
 		${INSTALL} ${INSTALL_COPY} ${INSTALL_STRIP} -o ${BINOWN} \
 		    -g ${BINGRP} -m ${BINMODE} objdump ${DESTDIR}${PREFIX}/bin