Page MenuHomeFreeBSD
Files F161922230

D50084.diff
No OneTemporary
Actions

D50084.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
@@ -1,5 +1,5 @@
.\" DO NOT EDIT-- this file is @generated by tools/build/options/makeman.
-.Dd April 30, 2025
+.Dd May 5, 2025
.Dt SRC.CONF 5
.Os
.Sh NAME
@@ -949,6 +949,8 @@
.Xr c++filt 1
and
.Xr objdump 1 .
+.Xr strings 1
+is always provided by ELF Tool Chain.
.It Va WITHOUT_LLVM_COV
Do not build the
.Xr llvm-cov 1
diff --git a/tools/build/options/WITHOUT_LLVM_BINUTILS b/tools/build/options/WITHOUT_LLVM_BINUTILS
--- a/tools/build/options/WITHOUT_LLVM_BINUTILS
+++ b/tools/build/options/WITHOUT_LLVM_BINUTILS
@@ -13,3 +13,5 @@
.Xr c++filt 1
and
.Xr objdump 1 .
+.Xr strings 1
+is always provided by ELF Tool Chain.
diff --git a/tools/build/options/WITH_LLVM_BINUTILS b/tools/build/options/WITH_LLVM_BINUTILS
--- a/tools/build/options/WITH_LLVM_BINUTILS
+++ b/tools/build/options/WITH_LLVM_BINUTILS
@@ -14,3 +14,5 @@
.Xr c++filt 1
and
.Xr objdump 1 .
+.Xr strings 1
+is always provided by ELF Tool Chain.
diff --git a/usr.bin/Makefile b/usr.bin/Makefile
--- a/usr.bin/Makefile
+++ b/usr.bin/Makefile
@@ -140,6 +140,7 @@
split \
stat \
stdbuf \
+ strings \
su \
systat \
tail \
@@ -250,13 +251,6 @@
SUBDIR.${MK_TOOLCHAIN}+= readelf
SUBDIR.${MK_TOOLCHAIN}+= size
.endif
-# Include elftoolchain's strings in build targets even if using LLVM_BINUTILS,
-# as we may later install with different options. In particular, the release
-# artifact builds use default options for buildworld but install with
-# MK_TOOLCHAIN=no which implies MK_LLVM_BINUTILS=no.
-.if ${MK_LLVM_BINUTILS} == "no" || !make(install)
-SUBDIR+= strings
-.endif
SUBDIR.${MK_TOOLCHAIN}+= c89
SUBDIR.${MK_TOOLCHAIN}+= c99
SUBDIR.${MK_TOOLCHAIN}+= ctags
diff --git a/usr.bin/clang/llvm-strings/Makefile b/usr.bin/clang/llvm-strings/Makefile
--- a/usr.bin/clang/llvm-strings/Makefile
+++ b/usr.bin/clang/llvm-strings/Makefile
@@ -1,5 +1,3 @@
-.include <src.opts.mk>
-
PROG_CXX= llvm-strings
SRCDIR= llvm/tools/llvm-strings
@@ -21,9 +19,4 @@
DPSRCS+= ${TGHDRS}
CLEANFILES+= ${TGHDRS} ${TGHDRS:C/$/.d/}
-.if ${MK_LLVM_BINUTILS} != "no"
-LINKS+= ${BINDIR}/llvm-strings ${BINDIR}/strings
-MLINKS+= llvm-strings.1 strings.1
-.endif
-
.include "../llvm.prog.mk"

File Metadata

Mime Type
text/plain
Expires
Thu, Jul 9, 1:22 AM (12 h, 19 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
34868190
Default Alt Text
D50084.diff (2 KB)

Event Timeline