The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=42e4df8b853186190b61428f0bd0f923cc525033
commit 42e4df8b853186190b61428f0bd0f923cc525033 Author: Ed Maste <[email protected]> AuthorDate: 2026-03-06 14:47:53 +0000 Commit: Ed Maste <[email protected]> CommitDate: 2026-03-06 14:50:54 +0000 usr.bin: Exclude ELF Tool Chain cxxfilt build when LLVM_BINUTILS is enabled (which is the default). PR: 293610 Fixes: 5d757312ad59 ("build: Retire LLVM_CXXFILT option") Sponsored by: The FreeBSD Foundation --- usr.bin/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/usr.bin/Makefile b/usr.bin/Makefile index 125ecb6f05a0..d536f26ab0da 100644 --- a/usr.bin/Makefile +++ b/usr.bin/Makefile @@ -248,6 +248,7 @@ SUBDIR.${MK_TFTP}+= tftp # Only build the elftoolchain tools if we aren't using the LLVM ones. SUBDIR.${MK_TOOLCHAIN}+= addr2line SUBDIR.${MK_TOOLCHAIN}+= ar +SUBDIR.${MK_TOOLCHAIN}+= cxxfilt SUBDIR.${MK_TOOLCHAIN}+= nm SUBDIR.${MK_TOOLCHAIN}+= readelf SUBDIR.${MK_TOOLCHAIN}+= size @@ -255,7 +256,6 @@ SUBDIR.${MK_TOOLCHAIN}+= size SUBDIR.${MK_TOOLCHAIN}+= c89 SUBDIR.${MK_TOOLCHAIN}+= c99 SUBDIR.${MK_TOOLCHAIN}+= ctags -SUBDIR.${MK_TOOLCHAIN}+= cxxfilt # ELF Tool Chain elfcopy required for EFI objects (PR280771) SUBDIR.${MK_TOOLCHAIN}+= elfcopy SUBDIR.${MK_TOOLCHAIN}+= file2c
