svn commit: r361656 - head/gnu/usr.bin/binutils

[Ed Maste]

Author: emaste
Date: Sat May 30 19:16:33 2020
New Revision: 361656
URL: https://svnweb.freebsd.org/changeset/base/361656

Log:
  binutils: build as with BINUTILS || BINUTILS_BOOTSTRAP
  
  Previously we descended into as only if MK_BINUTILS was true, including
  during the bootstrap tool phase.  BINUTILS is now disabled by default on
  all archs, and we failed to build it during amd64 bootstrap.
  
  Descend into as if either BINUTILS or BINUTILS_BOOTSTRAP is enabled.
  
  This is not quite correct: we should either have the test also depend on
  BOOTSTRAPPING, or set BINUTILS to the value of BINUTILS_BOOTSTRAP during
  the bootstrap phase.  However, this simple change fixes the build and
  has been tested, and binutils will be removed completely in the near
  future.

Modified:
  head/gnu/usr.bin/binutils/Makefile

Modified: head/gnu/usr.bin/binutils/Makefile
==============================================================================
--- head/gnu/usr.bin/binutils/Makefile	Sat May 30 19:15:29 2020	(r361655)
+++ head/gnu/usr.bin/binutils/Makefile	Sat May 30 19:16:33 2020	(r361656)
@@ -11,8 +11,9 @@ SUBDIR.${MK_BINUTILS}+=	doc
 # GNU as is used on x86 only, for a few files that cannot be assembled by
 # Clang IAS. Other archs either use Clang IAS for every assembly file, or
 # use external toolchain.
-.if ${TARGET} == "amd64" || ${TARGET} == "i386"
-SUBDIR.${MK_BINUTILS}+=	as
+.if (${TARGET} == "amd64" || ${TARGET} == "i386") && \
+    (${MK_BINUTILS} != "no" || ${MK_BINUTILS_BOOTSTRAP} != "no")
+SUBDIR+=	as
 .endif
 
 SUBDIR_DEPEND_as=libbfd libiberty libopcodes