From 03d837b565a96b450d62b904ee108677f23122f8 Mon Sep 17 00:00:00 2001 From: Ed Maste Date: Sun, 24 Jan 2021 12:22:01 -0500 Subject: [PATCH] Remove Binutils from src.conf(5) option descriptions All binutils remnants have been removed before FreeBSD 13. PR: 252842 MFC after: 3 days Sponsored by: The FreeBSD Foundation (cherry picked from commit b23665f3169b7b0364416060855541b450204d6d) --- tools/build/options/WITHOUT_LLD_BOOTSTRAP | 3 +-- tools/build/options/WITHOUT_LLD_IS_LD | 7 ++++++- tools/build/options/WITH_LLD_IS_LD | 2 +- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/tools/build/options/WITHOUT_LLD_BOOTSTRAP b/tools/build/options/WITHOUT_LLD_BOOTSTRAP index 646edd341c3..d9824c51b23 100644 --- a/tools/build/options/WITHOUT_LLD_BOOTSTRAP +++ b/tools/build/options/WITHOUT_LLD_BOOTSTRAP @@ -1,5 +1,4 @@ .\" $FreeBSD$ Set to not build the LLD linker during the bootstrap phase of the build. -To be able to build the system, either Binutils or LLD bootstrap must be -enabled unless an alternate linker is provided via XLD. +To be able to build the system an alternate linker must be provided via XLD. diff --git a/tools/build/options/WITHOUT_LLD_IS_LD b/tools/build/options/WITHOUT_LLD_IS_LD index 0d48f205d85..8ca789dfdc4 100644 --- a/tools/build/options/WITHOUT_LLD_IS_LD +++ b/tools/build/options/WITHOUT_LLD_IS_LD @@ -1,2 +1,7 @@ .\" $FreeBSD$ -Set to use GNU binutils ld as the system linker, instead of LLVM's LLD. +Do not install a +.Pa /usr/bin/ld symlink +to +.Pa ld.lld . +The system will not have a usable tool chain unless a linker is provided +some other way. diff --git a/tools/build/options/WITH_LLD_IS_LD b/tools/build/options/WITH_LLD_IS_LD index a291b099bf0..9a07c71fded 100644 --- a/tools/build/options/WITH_LLD_IS_LD +++ b/tools/build/options/WITH_LLD_IS_LD @@ -1,2 +1,2 @@ .\" $FreeBSD$ -Set to use LLVM's LLD as the system linker, instead of GNU binutils ld. +Set to use LLVM's LLD as the system linker.