summaryrefslogtreecommitdiff
path: root/gnu/usr.bin
diff options
context:
space:
mode:
authorDale Rahn <drahn@cvs.openbsd.org>2011-07-05 00:15:04 +0000
committerDale Rahn <drahn@cvs.openbsd.org>2011-07-05 00:15:04 +0000
commitf17051621fe5f212b673ad665c91f756ab6857c8 (patch)
tree5f911f61db315e1f14fd1712b5b9b46c6fd3d4b7 /gnu/usr.bin
parent0c6a676ac012b515a1b926eb9ff66e332a7763f8 (diff)
Allow switching between binutils and binutils 2.17.
NOTE: binutils-2.17 has not been tested on any archs. ok pirofti@
Diffstat (limited to 'gnu/usr.bin')
-rw-r--r--gnu/usr.bin/Makefile9
1 files changed, 7 insertions, 2 deletions
diff --git a/gnu/usr.bin/Makefile b/gnu/usr.bin/Makefile
index 6cbfffa3644..155cb05d279 100644
--- a/gnu/usr.bin/Makefile
+++ b/gnu/usr.bin/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.47 2010/10/18 17:11:27 deraadt Exp $
+# $OpenBSD: Makefile,v 1.48 2011/07/05 00:15:03 drahn Exp $
# $NetBSD: Makefile,v 1.35 1996/04/03 21:20:52 chuck Exp $
.include <bsd.own.mk>
@@ -15,7 +15,12 @@ SUBDIR+= ../egcs/gcc
. endif
.endif
-SUBDIR+= cxxfilt cvs lynx binutils
+SUBDIR+= cxxfilt cvs lynx
+.if make(obj)
+SUBDIR+= binutils binutils-2.17
+.else
+SUBDIR+= ${BINUTILS_VERSION}
+.endif
# most ports use binutils gas and ld, some do not (yet).
.if ${ELF_TOOLCHAIN:L} == "no"