From 1feb8780d1cb0d43e978306469f1309625892666 Mon Sep 17 00:00:00 2001
From: Sascha Wildner <saw@online.de>
Date: Thu, 15 Dec 2011 10:57:57 +0100
Subject: [PATCH] Add a NO_BINUTILS221 option (like NO_GCC41) to not build
 older binutils.

Reported-by: ftigeot
---
 etc/defaults/make.conf     | 1 +
 gnu/usr.bin/Makefile       | 2 ++
 share/man/man5/make.conf.5 | 5 ++++-
 3 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/etc/defaults/make.conf b/etc/defaults/make.conf
index cb435ab509..2c8180598f 100644
--- a/etc/defaults/make.conf
+++ b/etc/defaults/make.conf
@@ -98,6 +98,7 @@ THREAD_LIB?=	thread_xu
 #NO_NS_CACHING=	true
 #
 # To avoid building various parts of the base system:
+#NO_BINUTILS221=true	# do not build binutils-2.21
 #NO_CRYPT=	true	# do not build crypto code
 #NO_CVS=	true	# do not build CVS
 #NO_GAMES=	true	# do not enter the games subdirectory
diff --git a/gnu/usr.bin/Makefile b/gnu/usr.bin/Makefile
index db6f6c5a3a..a2229fa9ce 100644
--- a/gnu/usr.bin/Makefile
+++ b/gnu/usr.bin/Makefile
@@ -11,7 +11,9 @@ SUBDIR+=gdb
 .endif
 
 SUBDIR+= binutils222
+.if !defined(NO_BINUTILS221)
 SUBDIR+= binutils221
+.endif
 
 .if !defined(NO_GCC41)
 SUBDIR+= cc41
diff --git a/share/man/man5/make.conf.5 b/share/man/man5/make.conf.5
index 882e32c412..7b232384df 100644
--- a/share/man/man5/make.conf.5
+++ b/share/man/man5/make.conf.5
@@ -24,7 +24,7 @@
 .\"
 .\" $FreeBSD: src/share/man/man5/make.conf.5,v 1.12.2.30 2003/05/18 17:05:55 brueffer Exp $
 .\"
-.Dd November 26, 2011
+.Dd December 15, 2011
 .Dt MAKE.CONF 5
 .Os
 .Sh NAME
@@ -342,6 +342,9 @@ with the setuid bit turned on.
 .It Va MODULES_WITH_WORLD
 .Pq Vt bool
 Set to build modules with the system instead of the kernel.
+.It Va NO_BINUTILS221
+.Pq Vt bool
+Set to not build the older version of binutils (2.21).
 .It Va NO_CRYPT
 .Pq Vt bool
 Set to not build crypto code.
-- 
2.41.0