svn commit: r276414 - head

[Ed Maste]

Author: emaste
Date: Tue Dec 30 18:42:53 2014
New Revision: 276414
URL: https://svnweb.freebsd.org/changeset/base/276414

Log:
  Use BINUTILS_BOOTSTRAP knob for binutils only
  
  Previously it also disabled building elftoolchain bootstrap tools such as
  strip(1).
  
  Differential Revision:	https://reviews.freebsd.org/D1398
  Reviewed by:	imp
  Sponsored by:	The FreeBSD Foundation

Modified:
  head/Makefile.inc1

Modified: head/Makefile.inc1
==============================================================================
--- head/Makefile.inc1	Tue Dec 30 17:30:47 2014	(r276413)
+++ head/Makefile.inc1	Tue Dec 30 18:42:53 2014	(r276414)
@@ -1440,8 +1440,10 @@ _kgzip=		usr.sbin/kgzip
 .endif
 
 # If we're given an XAS, don't build binutils.
-.if ${XAS:M/*} == "" && ${MK_BINUTILS_BOOTSTRAP} != "no"
+.if ${XAS:M/*} == ""
+.if ${MK_BINUTILS_BOOTSTRAP} != "no"
 _binutils=	gnu/usr.bin/binutils
+.endif
 .if ${MK_ELFTOOLCHAIN_TOOLS} != "no"
 _elftctools=	lib/libelftc \
 		usr.bin/addr2line \