From 88dedd16ba659ea43bf5572a85e6f8151ee3fd87 Mon Sep 17 00:00:00 2001 From: Ed Maste Date: Fri, 6 Mar 2026 10:49:22 -0500 Subject: [PATCH] llvm-cxxfilt: Install as c++filt only with LLVM_BINUTILS When building WITHOUT_LLVM_BINUTILS /usr/bin/c++filt is the one from ELF Tool Chain. PR: 293610 Fixes: 5d757312ad59 ("build: Retire LLVM_CXXFILT option") Sponsored by: The FreeBSD Foundation --- usr.bin/clang/llvm-cxxfilt/Makefile | 2 ++ 1 file changed, 2 insertions(+) diff --git a/usr.bin/clang/llvm-cxxfilt/Makefile b/usr.bin/clang/llvm-cxxfilt/Makefile index 98cc5c09f4c..f53503378ea 100644 --- a/usr.bin/clang/llvm-cxxfilt/Makefile +++ b/usr.bin/clang/llvm-cxxfilt/Makefile @@ -22,7 +22,9 @@ DEPENDFILES+= ${TGHDRS:C/$/.d/} DPSRCS+= ${TGHDRS} CLEANFILES+= ${TGHDRS} ${TGHDRS:C/$/.d/} +.if ${MK_LLVM_BINUTILS} != "no" LINKS= ${BINDIR}/llvm-cxxfilt ${BINDIR}/c++filt MLINKS= llvm-cxxfilt.1 c++filt.1 +.endif .include "../llvm.prog.mk"