diff --git a/usr.bin/clang/Makefile b/usr.bin/clang/Makefile
index d86508829533..1d80fad2936f 100644
--- a/usr.bin/clang/Makefile
+++ b/usr.bin/clang/Makefile
@@ -1,73 +1,74 @@
 .include <src.opts.mk>
 
 .if ${MK_CLANG} != "no"
 SUBDIR+=	clang
 .endif
 
 .if !defined(TOOLS_PREFIX)
 .if ${MK_CLANG} != "no"
 SUBDIR+=	clang-scan-deps
 .endif
 
 # LLVM binutils are needed to support features such as LTO, so we build them
 # by default if clang is enabled. If MK_LLVM_BINUTILS is set, we also use them
 # as the default binutils (ar,nm,addr2line, etc.).
 .if ${MK_CLANG} != "no" || ${MK_LLVM_BINUTILS} != "no"
 SUBDIR+=	llvm-ar
 SUBDIR+=	llvm-cxxfilt
 SUBDIR+=	llvm-nm
 SUBDIR+=	llvm-objcopy
 SUBDIR+=	llvm-objdump
 SUBDIR+=	llvm-readobj
 SUBDIR+=	llvm-size
 SUBDIR+=	llvm-strings
 SUBDIR+=	llvm-symbolizer
 SUBDIR+=	.WAIT
 SUBDIR+=	toolchain
 .endif
 
 .if ${MK_CLANG_EXTRAS} != "no"
 SUBDIR+=	bugpoint
 SUBDIR+=	llc
 SUBDIR+=	lli
 SUBDIR+=	llvm-as
 SUBDIR+=	llvm-bcanalyzer
 SUBDIR+=	llvm-cxxdump
 SUBDIR+=	llvm-diff
 SUBDIR+=	llvm-dis
 SUBDIR+=	llvm-dwarfdump
 SUBDIR+=	llvm-dwarfutil
 SUBDIR+=	llvm-dwp
 SUBDIR+=	llvm-extract
 SUBDIR+=	llvm-link
 SUBDIR+=	llvm-lto
 SUBDIR+=	llvm-lto2
 SUBDIR+=	llvm-mc
 SUBDIR+=	llvm-mca
 SUBDIR+=	llvm-modextract
 SUBDIR+=	llvm-pdbutil
 SUBDIR+=	llvm-rtdyld
 SUBDIR+=	llvm-xray
 SUBDIR+=	opt
 .endif
 
 .if ${MK_CLANG_EXTRAS} != "no" || ${MK_CLANG_FORMAT} != "no"
 SUBDIR+=	clang-format
 .endif
 
 .if ${MK_LLD} != "no"
 SUBDIR+=	lld
 .endif
 .if ${MK_LLDB} != "no"
 SUBDIR+=	lldb
 SUBDIR+=	lldb-server
 .endif
 .if ${MK_LLVM_COV} != "no"
 SUBDIR+=	llvm-cov
 SUBDIR+=	llvm-profdata
+SUBDIR_DEPEND_toolchain=	llvm-cov
 .endif
 .endif # TOOLS_PREFIX
 
 SUBDIR_PARALLEL=
 
 .include <bsd.subdir.mk>
diff --git a/usr.bin/clang/llvm-cov/Makefile b/usr.bin/clang/llvm-cov/Makefile
index 3c02d4b7d144..67a93fa593bb 100644
--- a/usr.bin/clang/llvm-cov/Makefile
+++ b/usr.bin/clang/llvm-cov/Makefile
@@ -1,21 +1,19 @@
 .include <src.opts.mk>
 
 PROG_CXX=	llvm-cov
-SYMLINKS=	llvm-cov	${BINDIR}/gcov
-MLINKS=		llvm-cov.1		gcov.1
 
 SRCDIR=		llvm/tools/llvm-cov
 SRCS+=		CodeCoverage.cpp
 SRCS+=		CoverageExporterJson.cpp
 SRCS+=		CoverageExporterLcov.cpp
 SRCS+=		CoverageFilters.cpp
 SRCS+=		CoverageReport.cpp
 SRCS+=		CoverageSummaryInfo.cpp
 SRCS+=		SourceCoverageView.cpp
 SRCS+=		SourceCoverageViewHTML.cpp
 SRCS+=		SourceCoverageViewText.cpp
 SRCS+=		TestingSupport.cpp
 SRCS+=		gcov.cpp
 SRCS+=		llvm-cov.cpp
 
 .include "../llvm.prog.mk"
diff --git a/usr.bin/clang/llvm-objdump/Makefile b/usr.bin/clang/llvm-objdump/Makefile
index 86281217ee0a..c0c201b68085 100644
--- a/usr.bin/clang/llvm-objdump/Makefile
+++ b/usr.bin/clang/llvm-objdump/Makefile
@@ -1,35 +1,32 @@
 .include <src.opts.mk>
 
 PROG_CXX=	llvm-objdump
 
 SRCDIR=		llvm/tools/llvm-objdump
 SRCS+=		COFFDump.cpp
 SRCS+=		ELFDump.cpp
 SRCS+=		MachODump.cpp
 SRCS+=		OffloadDump.cpp
 SRCS+=		SourcePrinter.cpp
 SRCS+=		WasmDump.cpp
 SRCS+=		XCOFFDump.cpp
 SRCS+=		llvm-objdump-driver.cpp
 SRCS+=		llvm-objdump.cpp
 
 .include "${SRCTOP}/lib/clang/llvm.pre.mk"
 
 CFLAGS+=	-I${.OBJDIR}
 
 .for hdr in ObjdumpOpts OtoolOpts
 ${hdr}.inc: ${LLVM_BASE}/${SRCDIR}/${hdr}.td
 	${LLVM_TBLGEN} -gen-opt-parser-defs \
 	    -I ${LLVM_SRCS}/tools/llvm-objcopy -I ${LLVM_SRCS}/include \
 	    -d ${.TARGET}.d -o ${.TARGET} ${LLVM_BASE}/${SRCDIR}/${hdr}.td
 TGHDRS+=	${hdr}.inc
 .endfor
 
 DEPENDFILES+=	${TGHDRS:C/$/.d/}
 DPSRCS+=	${TGHDRS}
 CLEANFILES+=	${TGHDRS} ${TGHDRS:C/$/.d/}
 
-SYMLINKS=	llvm-objdump ${BINDIR}/objdump
-MLINKS=		llvm-objdump.1 objdump.1
-
 .include "../llvm.prog.mk"
diff --git a/usr.bin/clang/toolchain/Makefile b/usr.bin/clang/toolchain/Makefile
index 1a7db32274e3..5f66ae1433b1 100644
--- a/usr.bin/clang/toolchain/Makefile
+++ b/usr.bin/clang/toolchain/Makefile
@@ -1,35 +1,39 @@
 .include <src.opts.mk>
 
 .if ${MK_LLVM_BINUTILS} == yes
 PACKAGE=	toolchain
 
 SYMLINKS+=	llvm-ar ${BINDIR}/ar
 SYMLINKS+=	llvm-ranlib ${BINDIR}/ranlib
 MLINKS+=	llvm-ar.1 ar.1 llvm-ar.1 ranlib.1
 
+.if ${MK_LLVM_COV} != "no"
 SYMLINKS+=	llvm-cov ${BINDIR}/gcov
+MLINKS=		llvm-cov.1 gcov.1
+.endif
 
 SYMLINKS+=	llvm-cxxfilt ${BINDIR}/c++filt
 MLINKS+=	llvm-cxxfilt.1 c++filt.1
 
 SYMLINKS+=	llvm-nm ${BINDIR}/nm
 MLINKS+=	llvm-nm.1 nm.1
 
 SYMLINKS+=	llvm-objcopy ${BINDIR}/objcopy
 SYMLINKS+=	llvm-strip ${BINDIR}/strip
 MLINKS+=	llvm-objcopy.1 objcopy.1
 MLINKS+=	llvm-objcopy.1 strip.1
 
 SYMLINKS+=	llvm-objdump ${BINDIR}/objdump
+MLINKS=		llvm-objdump.1 objdump.1
 
 SYMLINKS+=	llvm-readelf ${BINDIR}/readelf
 MLINKS+=	llvm-readelf.1 readelf.1
 
 SYMLINKS+=	llvm-size ${BINDIR}/size
 MLINKS+=	llvm-size.1 size.1
 
 SYMLINKS+=	llvm-addr2line ${BINDIR}/addr2line
 MLINKS+=	llvm-addr2line.1 addr2line.1
 .endif
 
 .include <bsd.prog.mk>