From e71bfbe2f58ffff8f16a9da075d98fff41671bac Mon Sep 17 00:00:00 2001
From: Ed Maste <emaste@FreeBSD.org>
Date: Fri, 6 Mar 2026 12:52:15 -0500
Subject: [PATCH] llvm-*: Use SYMLINKS for unprefixed LLVM binutils

Previously they were hard links.  This change will support future
packaging changes by decoupling the prefixed (e.g. llvm-ar) and
unprefixed (e.g. ar) names.

Reviewed by:	dim, ivy
Sponsored by:	The FreeBSD Foundation
Differential Revision: https://reviews.freebsd.org/D55693
---
 usr.bin/clang/llvm-ar/Makefile         | 3 ++-
 usr.bin/clang/llvm-cov/Makefile        | 2 +-
 usr.bin/clang/llvm-cxxfilt/Makefile    | 2 +-
 usr.bin/clang/llvm-nm/Makefile         | 2 +-
 usr.bin/clang/llvm-objcopy/Makefile    | 4 ++--
 usr.bin/clang/llvm-objdump/Makefile    | 2 +-
 usr.bin/clang/llvm-readobj/Makefile    | 2 +-
 usr.bin/clang/llvm-size/Makefile       | 2 +-
 usr.bin/clang/llvm-symbolizer/Makefile | 2 +-
 9 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/usr.bin/clang/llvm-ar/Makefile b/usr.bin/clang/llvm-ar/Makefile
index e019c89b358..ee776a7c0d9 100644
--- a/usr.bin/clang/llvm-ar/Makefile
+++ b/usr.bin/clang/llvm-ar/Makefile
@@ -11,7 +11,8 @@ SRCS+=		llvm-ar.cpp
 LINKS+=		${BINDIR}/llvm-ar ${BINDIR}/llvm-ranlib
 
 .if ${MK_LLVM_BINUTILS} != "no"
-LINKS+=		${BINDIR}/llvm-ar ${BINDIR}/ar ${BINDIR}/llvm-ar ${BINDIR}/ranlib
+SYMLINKS+=	llvm-ar ${BINDIR}/ar
+SYMLINKS+=	llvm-ranlib ${BINDIR}/ranlib
 MLINKS+=	llvm-ar.1 ar.1 llvm-ar.1 ranlib.1
 .endif
 
diff --git a/usr.bin/clang/llvm-cov/Makefile b/usr.bin/clang/llvm-cov/Makefile
index 3eb14eb3713..3c02d4b7d14 100644
--- a/usr.bin/clang/llvm-cov/Makefile
+++ b/usr.bin/clang/llvm-cov/Makefile
@@ -1,7 +1,7 @@
 .include <src.opts.mk>
 
 PROG_CXX=	llvm-cov
-LINKS=		${BINDIR}/llvm-cov	${BINDIR}/gcov
+SYMLINKS=	llvm-cov	${BINDIR}/gcov
 MLINKS=		llvm-cov.1		gcov.1
 
 SRCDIR=		llvm/tools/llvm-cov
diff --git a/usr.bin/clang/llvm-cxxfilt/Makefile b/usr.bin/clang/llvm-cxxfilt/Makefile
index f53503378ea..26a5d9e8975 100644
--- a/usr.bin/clang/llvm-cxxfilt/Makefile
+++ b/usr.bin/clang/llvm-cxxfilt/Makefile
@@ -23,7 +23,7 @@ DPSRCS+=	${TGHDRS}
 CLEANFILES+=	${TGHDRS} ${TGHDRS:C/$/.d/}
 
 .if ${MK_LLVM_BINUTILS} != "no"
-LINKS=		${BINDIR}/llvm-cxxfilt ${BINDIR}/c++filt
+SYMLINKS=	llvm-cxxfilt ${BINDIR}/c++filt
 MLINKS=		llvm-cxxfilt.1 c++filt.1
 .endif
 
diff --git a/usr.bin/clang/llvm-nm/Makefile b/usr.bin/clang/llvm-nm/Makefile
index 7e089d1b408..333513246cb 100644
--- a/usr.bin/clang/llvm-nm/Makefile
+++ b/usr.bin/clang/llvm-nm/Makefile
@@ -24,7 +24,7 @@ DPSRCS+=	${TGHDRS}
 CLEANFILES+=	${TGHDRS} ${TGHDRS:C/$/.d/}
 
 .if ${MK_LLVM_BINUTILS} != "no"
-LINKS+=		${BINDIR}/llvm-nm ${BINDIR}/nm
+SYMLINKS+=	llvm-nm ${BINDIR}/nm
 MLINKS+=	llvm-nm.1 nm.1
 .endif
 
diff --git a/usr.bin/clang/llvm-objcopy/Makefile b/usr.bin/clang/llvm-objcopy/Makefile
index fcf59e4b4bc..13bbab97899 100644
--- a/usr.bin/clang/llvm-objcopy/Makefile
+++ b/usr.bin/clang/llvm-objcopy/Makefile
@@ -27,8 +27,8 @@ CLEANFILES+=	${TGHDRS} ${TGHDRS:C/$/.d/}
 LINKS=		${BINDIR}/llvm-objcopy ${BINDIR}/llvm-strip
 
 .if ${MK_LLVM_BINUTILS} != "no"
-LINKS+=		${BINDIR}/llvm-objcopy ${BINDIR}/objcopy \
-		${BINDIR}/llvm-strip ${BINDIR}/strip
+SYMLINKS+=	llvm-objcopy ${BINDIR}/objcopy \
+		llvm-strip ${BINDIR}/strip
 MLINKS=		llvm-objcopy.1 objcopy.1 \
 		llvm-objcopy.1 strip.1
 .endif
diff --git a/usr.bin/clang/llvm-objdump/Makefile b/usr.bin/clang/llvm-objdump/Makefile
index ad1c7beee95..86281217ee0 100644
--- a/usr.bin/clang/llvm-objdump/Makefile
+++ b/usr.bin/clang/llvm-objdump/Makefile
@@ -29,7 +29,7 @@ DEPENDFILES+=	${TGHDRS:C/$/.d/}
 DPSRCS+=	${TGHDRS}
 CLEANFILES+=	${TGHDRS} ${TGHDRS:C/$/.d/}
 
-LINKS=		${BINDIR}/llvm-objdump ${BINDIR}/objdump
+SYMLINKS=	llvm-objdump ${BINDIR}/objdump
 MLINKS=		llvm-objdump.1 objdump.1
 
 .include "../llvm.prog.mk"
diff --git a/usr.bin/clang/llvm-readobj/Makefile b/usr.bin/clang/llvm-readobj/Makefile
index f532358ea79..3f705431e50 100644
--- a/usr.bin/clang/llvm-readobj/Makefile
+++ b/usr.bin/clang/llvm-readobj/Makefile
@@ -36,7 +36,7 @@ CLEANFILES+=	${TGHDRS} ${TGHDRS:C/$/.d/}
 LINKS+=		${BINDIR}/llvm-readobj ${BINDIR}/llvm-readelf
 
 .if ${MK_LLVM_BINUTILS} != "no"
-LINKS+=		${BINDIR}/llvm-readelf ${BINDIR}/readelf
+SYMLINKS+=	llvm-readelf ${BINDIR}/readelf
 MLINKS+=		llvm-readelf.1 readelf.1
 .endif
 
diff --git a/usr.bin/clang/llvm-size/Makefile b/usr.bin/clang/llvm-size/Makefile
index 9d3505cdd31..1991065b61b 100644
--- a/usr.bin/clang/llvm-size/Makefile
+++ b/usr.bin/clang/llvm-size/Makefile
@@ -24,7 +24,7 @@ DPSRCS+=	${TGHDRS}
 CLEANFILES+=	${TGHDRS} ${TGHDRS:C/$/.d/}
 
 .if ${MK_LLVM_BINUTILS} != "no"
-LINKS+=		${BINDIR}/llvm-size ${BINDIR}/size
+SYMLINKS+=	llvm-size ${BINDIR}/size
 MLINKS+=	llvm-size.1 size.1
 .endif
 
diff --git a/usr.bin/clang/llvm-symbolizer/Makefile b/usr.bin/clang/llvm-symbolizer/Makefile
index c45300c92a9..1a3a65c774c 100644
--- a/usr.bin/clang/llvm-symbolizer/Makefile
+++ b/usr.bin/clang/llvm-symbolizer/Makefile
@@ -26,7 +26,7 @@ CLEANFILES+=	${TGHDRS} ${TGHDRS:C/$/.d/}
 LINKS+=		${BINDIR}/llvm-symbolizer ${BINDIR}/llvm-addr2line
 
 .if ${MK_LLVM_BINUTILS} != "no"
-LINKS+=		${BINDIR}/llvm-symbolizer ${BINDIR}/addr2line
+SYMLINKS+=	llvm-addr2line ${BINDIR}/addr2line
 MLINKS+=	llvm-addr2line.1 addr2line.1
 .endif