Page MenuHomeFreeBSD
Files F102556531

D41266.diff
No OneTemporary
Actions

D41266.diff
View Options

diff --git a/share/man/man5/src.conf.5 b/share/man/man5/src.conf.5
--- a/share/man/man5/src.conf.5
+++ b/share/man/man5/src.conf.5
@@ -1532,12 +1532,6 @@
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
--- a/share/mk/local.sys.dirdeps.mk
+++ b/share/mk/local.sys.dirdeps.mk
@@ -64,9 +64,6 @@
.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
--- a/share/mk/src.opts.mk
+++ b/share/mk/src.opts.mk
@@ -168,7 +168,6 @@
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
--- 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
--- 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
--- a/usr.bin/ar/Makefile
+++ b/usr.bin/ar/Makefile
@@ -11,9 +11,6 @@
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
--- a/usr.bin/bmake/Makefile.inc
+++ b/usr.bin/bmake/Makefile.inc
@@ -18,10 +18,6 @@
.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
--- a/usr.bin/clang/clang/Makefile
+++ b/usr.bin/clang/clang/Makefile
@@ -12,11 +12,6 @@
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
--- a/usr.bin/clang/lld/Makefile
+++ b/usr.bin/clang/lld/Makefile
@@ -16,10 +16,6 @@
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

File Metadata

Mime Type
text/plain
Expires
Fri, Nov 15, 12:43 AM (9 h, 9 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
14635907
Default Alt Text
D41266.diff (3 KB)

Event Timeline