diff --git a/usr.bin/clang/Makefile b/usr.bin/clang/Makefile
index d8650882953..1d80fad2936 100644
--- a/usr.bin/clang/Makefile
+++ b/usr.bin/clang/Makefile
@@ -65,6 +65,7 @@ SUBDIR+=	lldb-server
 .if ${MK_LLVM_COV} != "no"
 SUBDIR+=	llvm-cov
 SUBDIR+=	llvm-profdata
+SUBDIR_DEPEND_toolchain=	llvm-cov
 .endif
 .endif # TOOLS_PREFIX
 
diff --git a/usr.bin/clang/llvm-cov/Makefile b/usr.bin/clang/llvm-cov/Makefile
index 3c02d4b7d14..67a93fa593b 100644
--- a/usr.bin/clang/llvm-cov/Makefile
+++ b/usr.bin/clang/llvm-cov/Makefile
@@ -1,8 +1,6 @@
 .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
diff --git a/usr.bin/clang/llvm-objdump/Makefile b/usr.bin/clang/llvm-objdump/Makefile
index 86281217ee0..c0c201b6808 100644
--- a/usr.bin/clang/llvm-objdump/Makefile
+++ b/usr.bin/clang/llvm-objdump/Makefile
@@ -29,7 +29,4 @@ 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 1a7db32274e..5f66ae1433b 100644
--- a/usr.bin/clang/toolchain/Makefile
+++ b/usr.bin/clang/toolchain/Makefile
@@ -7,7 +7,10 @@ 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
@@ -21,6 +24,7 @@ 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