The branch main has been updated by ivy:
URL:
https://cgit.FreeBSD.org/src/commit/?id=328110da2661a8841f12000b99fea27ceacdd5b2
commit 328110da2661a8841f12000b99fea27ceacdd5b2
Author: Lexi Winter <i...@freebsd.org>
AuthorDate: 2025-07-28 16:29:09 +0000
Commit: Lexi Winter <i...@freebsd.org>
CommitDate: 2025-07-28 16:29:29 +0000
Move toolchain utils to -toolchain package
Move LLVM ar, nm, and size. Also move elftoolchain strings, which
should have already been there.
The remaining LLVM utilities (including strings) stay in -clang for now
since they're links to other executables.
Reviewed by: des, dim
Differential Revision: https://reviews.freebsd.org/D51583
---
usr.bin/clang/clang.prog.mk | 2 +-
usr.bin/clang/llvm-ar/Makefile | 1 +
usr.bin/clang/llvm-nm/Makefile | 1 +
usr.bin/clang/llvm-size/Makefile | 1 +
usr.bin/clang/llvm.prog.mk | 2 +-
usr.bin/strings/Makefile | 2 ++
6 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/usr.bin/clang/clang.prog.mk b/usr.bin/clang/clang.prog.mk
index 36c601bcbe36..3baf3d0baf0f 100644
--- a/usr.bin/clang/clang.prog.mk
+++ b/usr.bin/clang/clang.prog.mk
@@ -31,7 +31,7 @@ DPADD+=
${OBJTOP}/lib/clang/lib${lib}/lib${LIBPRIV}${lib}.${LIBEXT}
LDADD+=
${OBJTOP}/lib/clang/lib${lib}/lib${LIBPRIV}${lib}.${LIBEXT}
.endfor
-PACKAGE= clang
+PACKAGE?= clang
.if ${.MAKE.OS} == "FreeBSD" || !defined(BOOTSTRAPPING)
LIBADD+= execinfo
diff --git a/usr.bin/clang/llvm-ar/Makefile b/usr.bin/clang/llvm-ar/Makefile
index fd12b1ddef57..e019c89b3581 100644
--- a/usr.bin/clang/llvm-ar/Makefile
+++ b/usr.bin/clang/llvm-ar/Makefile
@@ -1,5 +1,6 @@
.include <src.opts.mk>
+PACKAGE= toolchain
PROG_CXX= llvm-ar
MAN= llvm-ar.1 llvm-ranlib.1
diff --git a/usr.bin/clang/llvm-nm/Makefile b/usr.bin/clang/llvm-nm/Makefile
index 825faf74719b..7e089d1b408d 100644
--- a/usr.bin/clang/llvm-nm/Makefile
+++ b/usr.bin/clang/llvm-nm/Makefile
@@ -1,5 +1,6 @@
.include <src.opts.mk>
+PACKAGE= toolchain
PROG_CXX= llvm-nm
SRCDIR= llvm/tools/llvm-nm
diff --git a/usr.bin/clang/llvm-size/Makefile b/usr.bin/clang/llvm-size/Makefile
index 2860a0069538..9d3505cdd319 100644
--- a/usr.bin/clang/llvm-size/Makefile
+++ b/usr.bin/clang/llvm-size/Makefile
@@ -1,5 +1,6 @@
.include <src.opts.mk>
+PACKAGE= toolchain
PROG_CXX= llvm-size
SRCDIR= llvm/tools/llvm-size
diff --git a/usr.bin/clang/llvm.prog.mk b/usr.bin/clang/llvm.prog.mk
index f702082e31bd..c369fe8d5944 100644
--- a/usr.bin/clang/llvm.prog.mk
+++ b/usr.bin/clang/llvm.prog.mk
@@ -25,7 +25,7 @@ DPADD+=
${OBJTOP}/lib/clang/lib${lib}/lib${LIBPRIV}${lib}.${LIBEXT}
LDADD+=
${OBJTOP}/lib/clang/lib${lib}/lib${LIBPRIV}${lib}.${LIBEXT}
.endfor
-PACKAGE= clang
+PACKAGE?= clang
.if ${.MAKE.OS} == "FreeBSD" || !defined(BOOTSTRAPPING)
LIBADD+= execinfo
diff --git a/usr.bin/strings/Makefile b/usr.bin/strings/Makefile
index 8e2572810947..c01e775b0b89 100644
--- a/usr.bin/strings/Makefile
+++ b/usr.bin/strings/Makefile
@@ -1,5 +1,7 @@
.include <src.opts.mk>
+PACKAGE= toolchain
+
ELFTCDIR= ${SRCTOP}/contrib/elftoolchain
.PATH: ${ELFTCDIR}/strings
