Index: head/gnu/usr.bin/binutils/Makefile =================================================================== --- head/gnu/usr.bin/binutils/Makefile (revision 356735) +++ head/gnu/usr.bin/binutils/Makefile (revision 356736) @@ -1,31 +1,29 @@ # $FreeBSD$ .include SUBDIR= libiberty \ libbfd \ libopcodes SUBDIR.${MK_BINUTILS}+= doc SUBDIR.${MK_BINUTILS}+= libbinutils SUBDIR.${MK_BINUTILS}+= as SUBDIR.${MK_BINUTILS}+= objdump -# When we use ld.lld as /usr/bin/ld, do not install the non-ifunc-capable -# GNU binutils 2.17.50 ld. -# Except if we are on powerpc, that needs the ld from binutils to link -# 32-bit binaries. -.if ${MK_LLD_IS_LD} == "no" || ${TARGET} == "powerpc" +# All archs except powerpc either use lld or require external toolchain. +# powerpc still needs binutils ld to link 32-bit binaries. +.if ${TARGET} == "powerpc" SUBDIR.${MK_BINUTILS}+=ld .endif SUBDIR_DEPEND_libbinutils=libbfd # for bfdver.h SUBDIR_DEPEND_as=libbfd libiberty libopcodes SUBDIR_DEPEND_ld=libbfd libiberty SUBDIR_DEPEND_objdump=libbfd libiberty libbinutils libopcodes .if !make(install) SUBDIR_PARALLEL= .endif .include Index: head/tools/build/options/WITHOUT_BINUTILS =================================================================== --- head/tools/build/options/WITHOUT_BINUTILS (revision 356735) +++ head/tools/build/options/WITHOUT_BINUTILS (revision 356736) @@ -1,9 +1,9 @@ .\" $FreeBSD$ Set to not build or install GNU .Xr as 1 , .Xr objdump 1 , -and for some CPU architectures +and, on powerpc, .Xr ld.bfd 1 as part of the normal system build. The resulting system cannot build programs from source. Index: head/tools/build/options/WITHOUT_BINUTILS_BOOTSTRAP =================================================================== --- head/tools/build/options/WITHOUT_BINUTILS_BOOTSTRAP (revision 356735) +++ head/tools/build/options/WITHOUT_BINUTILS_BOOTSTRAP (revision 356736) @@ -1,7 +1,7 @@ .\" $FreeBSD$ -Set to not build binutils (as, ld, and objdump) +Set to not build binutils (as, objdump, and on powerpc ld) as part of the bootstrap process. .Bf -symbolic The option does not work for build targets unless some alternative toolchain is provided. .Ef Index: head/tools/build/options/WITH_BINUTILS =================================================================== --- head/tools/build/options/WITH_BINUTILS (revision 356735) +++ head/tools/build/options/WITH_BINUTILS (revision 356736) @@ -1,8 +1,8 @@ .\" $FreeBSD$ Set to build and install GNU .Xr as 1 , .Xr objdump 1 , -and for some CPU architectures +and, on powerpc, .Xr ld.bfd 1 as part of the normal system build. Index: head/tools/build/options/WITH_BINUTILS_BOOTSTRAP =================================================================== --- head/tools/build/options/WITH_BINUTILS_BOOTSTRAP (revision 356735) +++ head/tools/build/options/WITH_BINUTILS_BOOTSTRAP (revision 356736) @@ -1,3 +1,3 @@ .\" $FreeBSD$ -Set build binutils (as, ld, and objdump) +Set build binutils (as, objdump, and on powerpc ld) as part of the bootstrap process.