diff --git a/lib/clang/libllvm/Makefile b/lib/clang/libllvm/Makefile
index 0fe8ae1e325..dfe9854f0da 100644
--- a/lib/clang/libllvm/Makefile
+++ b/lib/clang/libllvm/Makefile
@@ -664,7 +664,7 @@ SRCS_MIN+=	Passes/PassBuilder.cpp
 SRCS_MIN+=	ProfileData/Coverage/CoverageMapping.cpp
 SRCS_MIN+=	ProfileData/Coverage/CoverageMappingReader.cpp
 SRCS_MIN+=	ProfileData/Coverage/CoverageMappingWriter.cpp
-SRCS_EXT+=	ProfileData/GCOV.cpp
+SRCS_MIN+=	ProfileData/GCOV.cpp
 SRCS_MIN+=	ProfileData/InstrProf.cpp
 SRCS_MIN+=	ProfileData/InstrProfReader.cpp
 SRCS_MIN+=	ProfileData/InstrProfWriter.cpp
diff --git a/share/mk/src.opts.mk b/share/mk/src.opts.mk
index 0d8c38b646e..425157b031e 100644
--- a/share/mk/src.opts.mk
+++ b/share/mk/src.opts.mk
@@ -119,6 +119,7 @@ __DEFAULT_YES_OPTIONS = \
     LIB32 \
     LIBPTHREAD \
     LIBTHR \
+    LLVM_COV \
     LOCALES \
     LOCATE \
     LPR \
@@ -425,6 +426,7 @@ MK_LLDB:=	no
 .if ${MK_CLANG} == "no"
 MK_CLANG_EXTRAS:= no
 MK_CLANG_FULL:= no
+MK_LLVM_COV:= no
 .endif
 
 #
diff --git a/tools/build/options/WITHOUT_LLVM_COV b/tools/build/options/WITHOUT_LLVM_COV
new file mode 100644
index 00000000000..783d7f9be0d
--- /dev/null
+++ b/tools/build/options/WITHOUT_LLVM_COV
@@ -0,0 +1,4 @@
+.\" $FreeBSD$
+Set to not build the
+.Xr llvm-cov 1
+tool.
diff --git a/tools/build/options/WITH_LLVM_COV b/tools/build/options/WITH_LLVM_COV
new file mode 100644
index 00000000000..f19556d501f
--- /dev/null
+++ b/tools/build/options/WITH_LLVM_COV
@@ -0,0 +1,4 @@
+.\" $FreeBSD$
+Set to build the
+.Xr llvm-cov 1
+tool.
diff --git a/usr.bin/clang/Makefile b/usr.bin/clang/Makefile
index f7548cf58d8..9d081c0fdda 100644
--- a/usr.bin/clang/Makefile
+++ b/usr.bin/clang/Makefile
@@ -17,7 +17,6 @@ SUBDIR+=	lli
 SUBDIR+=	llvm-ar
 SUBDIR+=	llvm-as
 SUBDIR+=	llvm-bcanalyzer
-SUBDIR+=	llvm-cov
 SUBDIR+=	llvm-cxxdump
 SUBDIR+=	llvm-cxxfilt
 SUBDIR+=	llvm-diff
@@ -44,7 +43,10 @@ SUBDIR+=	lld
 .endif
 .if ${MK_LLDB} != "no"
 SUBDIR+=	lldb
-.endif # MK_LLDB
+.endif
+.if ${MK_LLVM_COV} != "no"
+SUBDIR+=	llvm-cov
+.endif
 .endif # TOOLS_PREFIX
 
 SUBDIR_PARALLEL=