jimzah/freebsd-src
1
0
Fork 0
mirror of https://github.com/freebsd/freebsd-src.git synced 2024-11-30 04:22:44 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

binutils: build as with BINUTILS || BINUTILS_BOOTSTRAP

Browse Source 
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.
This commit is contained in:
Ed Maste 2020-05-30 19:16:33 +00:00
parent b0763b5ddd
commit af097a7d50
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=361656
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
gnu/usr.bin/binutils/Makefile
View File

@ -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