git: 77f6be448408 - main - retire SHARED_TOOLCHAIN knob

The branch main has been updated by emaste:

URL: https://cgit.FreeBSD.org/src/commit/?id=77f6be448408eda1a31b1c98576e6c6bebf6ea6e

commit 77f6be448408eda1a31b1c98576e6c6bebf6ea6e
Author:     Ed Maste <emaste@FreeBSD.org>
AuthorDate: 2023-08-01 12:48:02 +0000
Commit:     Ed Maste <emaste@FreeBSD.org>
CommitDate: 2023-08-02 00:13:22 +0000

    retire SHARED_TOOLCHAIN knob
    
    Toolchain components were historically statically linked.  They became
    normal dynamically linked executables in commit 6ab18ea64d19.  There is
    no need to keep a special case build option for the toolchain; users who
    want statically linked toolchain (or any other) components can use the
    existing NO_SHARED knob.
    
    Reviewed by:    dim, sjg
    Relnotes:       Yes
    Sponsored by:   The FreeBSD Foundation
    Differential Revision:  https://reviews.freebsd.org/D41266
---
 share/man/man5/src.conf.5                    | 6 ------
 share/mk/local.sys.dirdeps.mk                | 3 ---
 share/mk/src.opts.mk                         | 1 -
 tools/build/options/WITHOUT_SHARED_TOOLCHAIN | 6 ------
 tools/build/options/WITH_SHARED_TOOLCHAIN    | 6 ------
 usr.bin/ar/Makefile                          | 3 ---
 usr.bin/bmake/Makefile.inc                   | 4 ----
 usr.bin/clang/clang/Makefile                 | 5 -----
 usr.bin/clang/lld/Makefile                   | 4 ----
 9 files changed, 38 deletions(-)

diff --git a/share/man/man5/src.conf.5 b/share/man/man5/src.conf.5
index 4554735207c8..3eeb3440e986 100644
--- a/share/man/man5/src.conf.5
+++ b/share/man/man5/src.conf.5
@@ -1532,12 +1532,6 @@ as a set-user-ID root program.
 Do not build the
 .Bx 4.4
 legacy docs.
-.It Va WITHOUT_SHARED_TOOLCHAIN
-Build the toolchain binaries as statically linked executables.
-The set includes
-.Xr cc 1 ,
-.Xr make 1
-and necessary utilities like assembler, linker and library archive manager.
 .It Va WITH_SORT_THREADS
 Enable threads in
 .Xr sort 1 .
diff --git a/share/mk/local.sys.dirdeps.mk b/share/mk/local.sys.dirdeps.mk
index 00030cb247bb..f06b4a33f1f7 100644
--- a/share/mk/local.sys.dirdeps.mk
+++ b/share/mk/local.sys.dirdeps.mk
@@ -64,9 +64,6 @@ WITH_META_STATS= t
 .endif
 
 # toolchains can be a pain - especially bootstrappping them
-.if ${MACHINE} == "host"
-MK_SHARED_TOOLCHAIN= no
-.endif
 TOOLCHAIN_VARS=	AS AR CC CLANG_TBLGEN CXX CPP LD NM OBJCOPY RANLIB \
 		STRINGS SIZE LLVM_TBLGEN
 _toolchain_bin_CLANG_TBLGEN=	/usr/bin/clang-tblgen
diff --git a/share/mk/src.opts.mk b/share/mk/src.opts.mk
index 899d620fb0c1..bed2b718654d 100644
--- a/share/mk/src.opts.mk
+++ b/share/mk/src.opts.mk
@@ -168,7 +168,6 @@ __DEFAULT_YES_OPTIONS = \
     SENDMAIL \
     SERVICESDB \
     SETUID_LOGIN \
-    SHARED_TOOLCHAIN \
     SHAREDOCS \
     SOURCELESS \
     SOURCELESS_HOST \
diff --git a/tools/build/options/WITHOUT_SHARED_TOOLCHAIN b/tools/build/options/WITHOUT_SHARED_TOOLCHAIN
deleted file mode 100644
index 86e309028c21..000000000000
--- a/tools/build/options/WITHOUT_SHARED_TOOLCHAIN
+++ /dev/null
@@ -1,6 +0,0 @@
-.\" $FreeBSD$
-Build the toolchain binaries as statically linked executables.
-The set includes
-.Xr cc 1 ,
-.Xr make 1
-and necessary utilities like assembler, linker and library archive manager.
diff --git a/tools/build/options/WITH_SHARED_TOOLCHAIN b/tools/build/options/WITH_SHARED_TOOLCHAIN
deleted file mode 100644
index 12956c3ff933..000000000000
--- a/tools/build/options/WITH_SHARED_TOOLCHAIN
+++ /dev/null
@@ -1,6 +0,0 @@
-.\" $FreeBSD$
-Build the toolchain binaries as dynamically linked executables.
-The set includes
-.Xr cc 1 ,
-.Xr make 1
-and necessary utilities like assembler, linker and library archive manager.
diff --git a/usr.bin/ar/Makefile b/usr.bin/ar/Makefile
index 7a6601a7d043..17b78191794a 100644
--- a/usr.bin/ar/Makefile
+++ b/usr.bin/ar/Makefile
@@ -11,9 +11,6 @@ NO_WMISSING_VARIABLE_DECLARATIONS=
 
 CFLAGS+=-I. -I${.CURDIR}
 
-.if ${MK_SHARED_TOOLCHAIN} == "no"
-NO_SHARED?=	yes
-.endif
 LINKS=	${BINDIR}/ar ${BINDIR}/ranlib
 MLINKS= ar.1 ranlib.1
 
diff --git a/usr.bin/bmake/Makefile.inc b/usr.bin/bmake/Makefile.inc
index 22799321f69e..e6ffa4d6f756 100644
--- a/usr.bin/bmake/Makefile.inc
+++ b/usr.bin/bmake/Makefile.inc
@@ -18,10 +18,6 @@ MLINKS= ${MAN} b${MAN}
 .endif
 .endif
 
-.if !defined(MK_SHARED_TOOLCHAIN) || ${MK_SHARED_TOOLCHAIN} == "no"
-NO_SHARED?=     YES
-.endif
-
 # hack to not add tests to tests subdir since this is included from
 # there and to avoid renaming things that require changes to generated
 # files.
diff --git a/usr.bin/clang/clang/Makefile b/usr.bin/clang/clang/Makefile
index 4b1e3735939a..97e6e1fb6996 100644
--- a/usr.bin/clang/clang/Makefile
+++ b/usr.bin/clang/clang/Makefile
@@ -12,11 +12,6 @@ SRCS+=		driver.cpp
 
 CFLAGS.driver.cpp+=	-Dclang_main=main
 
-.if ${MK_SHARED_TOOLCHAIN} == "no"
-NO_SHARED?= yes
-
-.endif
-
 LINKS=	${BINDIR}/clang ${BINDIR}/clang++ \
 	${BINDIR}/clang ${BINDIR}/clang-cpp
 MLINKS=	clang.1 clang++.1 \
diff --git a/usr.bin/clang/lld/Makefile b/usr.bin/clang/lld/Makefile
index fb10ca7176d1..94adfceaf728 100644
--- a/usr.bin/clang/lld/Makefile
+++ b/usr.bin/clang/lld/Makefile
@@ -16,10 +16,6 @@ SYMLINKS=	${PROG_CXX} ${BINDIR}/ld
 MLINKS=		ld.lld.1 ld.1
 .endif
 
-.if ${MK_SHARED_TOOLCHAIN} == "no"
-NO_SHARED?= yes
-.endif
-
 .include "${SRCTOP}/lib/clang/llvm.pre.mk"
 
 CFLAGS+=	-I${LLD_SRCS}/ELF