git: 81fa5c4a828b - main - llvm-strings: Install as strings when WITH_LLVM_BINUTILS=YES
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Fri, 21 Apr 2023 20:14:07 UTC
The branch main has been updated by emaste:
URL: https://cgit.FreeBSD.org/src/commit/?id=81fa5c4a828bec9f1ead280c59c31bd423e6eeea
commit 81fa5c4a828bec9f1ead280c59c31bd423e6eeea
Author: Cameron Katri <me@cameronkatri.com>
AuthorDate: 2023-04-05 19:53:33 +0000
Commit: Ed Maste <emaste@FreeBSD.org>
CommitDate: 2023-04-21 20:13:40 +0000
llvm-strings: Install as strings when WITH_LLVM_BINUTILS=YES
Reviewed by: emaste
Differential Revision: https://reviews.freebsd.org/D32065
---
usr.bin/Makefile | 2 +-
usr.bin/clang/llvm-strings/Makefile | 7 +++++++
2 files changed, 8 insertions(+), 1 deletion(-)
diff --git a/usr.bin/Makefile b/usr.bin/Makefile
index 417c564b2fae..19988d35c7ba 100644
--- a/usr.bin/Makefile
+++ b/usr.bin/Makefile
@@ -144,7 +144,6 @@ SUBDIR= alias \
split \
stat \
stdbuf \
- strings \
su \
systat \
tail \
@@ -258,6 +257,7 @@ SUBDIR.${MK_TOOLCHAIN}+= nm
SUBDIR.${MK_TOOLCHAIN}+= objcopy
SUBDIR.${MK_TOOLCHAIN}+= readelf
SUBDIR.${MK_TOOLCHAIN}+= size
+SUBDIR+= strings
.endif
SUBDIR.${MK_TOOLCHAIN}+= c89
SUBDIR.${MK_TOOLCHAIN}+= c99
diff --git a/usr.bin/clang/llvm-strings/Makefile b/usr.bin/clang/llvm-strings/Makefile
index 1438aa847997..589c866820c4 100644
--- a/usr.bin/clang/llvm-strings/Makefile
+++ b/usr.bin/clang/llvm-strings/Makefile
@@ -1,5 +1,7 @@
# $FreeBSD$
+.include <src.opts.mk>
+
PROG_CXX= llvm-strings
SRCDIR= llvm/tools/llvm-strings
@@ -21,4 +23,9 @@ DEPENDFILES+= ${TGHDRS:C/$/.d/}
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"