From af097a7d500a9b798bd90bf978d95ff15c484dac Mon Sep 17 00:00:00 2001 From: Ed Maste Date: Sat, 30 May 2020 19:16:33 +0000 Subject: [PATCH] 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. --- gnu/usr.bin/binutils/Makefile | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/gnu/usr.bin/binutils/Makefile b/gnu/usr.bin/binutils/Makefile index 558fd627bed..7eacb985104 100644 --- a/gnu/usr.bin/binutils/Makefile +++ b/gnu/usr.bin/binutils/Makefile @@ -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