Date: Wed, 11 Mar 2026 13:38:39 +0000 From: Ed Maste <emaste@FreeBSD.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Subject: git: e71bfbe2f58f - main - llvm-*: Use SYMLINKS for unprefixed LLVM binutils Message-ID: <69b1705f.24a4c.61c52bd9@gitrepo.freebsd.org>
index | next in thread | raw e-mail
The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=e71bfbe2f58ffff8f16a9da075d98fff41671bac commit e71bfbe2f58ffff8f16a9da075d98fff41671bac Author: Ed Maste <emaste@FreeBSD.org> AuthorDate: 2026-03-06 17:52:15 +0000 Commit: Ed Maste <emaste@FreeBSD.org> CommitDate: 2026-03-11 13:37:05 +0000 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 e019c89b3581..ee776a7c0d9e 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 3eb14eb37139..3c02d4b7d144 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 f53503378ea8..26a5d9e8975d 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 7e089d1b408d..333513246cb6 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 fcf59e4b4bca..13bbab97899f 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 ad1c7beee95f..86281217ee0a 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 f532358ea79e..3f705431e509 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 9d3505cdd319..1991065b61b2 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 c45300c92a90..1a3a65c774c9 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 .endifhome | help
Want to link to this message? Use this
URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?69b1705f.24a4c.61c52bd9>