diff --git a/usr.bin/clang/bugpoint/Makefile b/usr.bin/clang/bugpoint/Makefile
index 2ca34d2579e3..2afd888f1df7 100644
--- a/usr.bin/clang/bugpoint/Makefile
+++ b/usr.bin/clang/bugpoint/Makefile
@@ -1,19 +1,16 @@
 # $FreeBSD$
 
 PROG_CXX=	bugpoint
 
 SRCDIR=		llvm/tools/bugpoint
 SRCS+=		BugDriver.cpp
 SRCS+=		CrashDebugger.cpp
 SRCS+=		ExecutionDriver.cpp
 SRCS+=		ExtractFunction.cpp
 SRCS+=		FindBugs.cpp
 SRCS+=		Miscompilation.cpp
 SRCS+=		OptimizerDriver.cpp
 SRCS+=		ToolRunner.cpp
 SRCS+=		bugpoint.cpp
 
-LIBADD+=	z
-LIBADD+=	zstd
-
 .include "../llvm.prog.mk"
diff --git a/usr.bin/clang/clang.prog.mk b/usr.bin/clang/clang.prog.mk
index 79229be332a8..faa4918c7298 100644
--- a/usr.bin/clang/clang.prog.mk
+++ b/usr.bin/clang/clang.prog.mk
@@ -1,33 +1,35 @@
 # $FreeBSD$
 
 .include "${SRCTOP}/lib/clang/clang.pre.mk"
 
 CFLAGS+=	-I${OBJTOP}/lib/clang/libclang
 CFLAGS+=	-I${OBJTOP}/lib/clang/libllvm
 
 .include "${SRCTOP}/lib/clang/clang.build.mk"
 
 # Special case for the bootstrap-tools phase.
 .if (defined(TOOLS_PREFIX) || ${MACHINE} == "host") && \
     ${PROG_CXX} == "clang-tblgen"
 LIBDEPS+=	clangminimal
 LIBDEPS+=	llvmminimal
 .else
 LIBDEPS+=	clang
 LIBDEPS+=	llvm
 .endif
 
 .for lib in ${LIBDEPS}
 DPADD+=		${OBJTOP}/lib/clang/lib${lib}/lib${lib}.a
 LDADD+=		${OBJTOP}/lib/clang/lib${lib}/lib${lib}.a
 .endfor
 
 PACKAGE=	clang
 
 .if ${.MAKE.OS} == "FreeBSD" || !defined(BOOTSTRAPPING)
 LIBADD+=	execinfo
 LIBADD+=	ncursesw
 .endif
 LIBADD+=	pthread
+LIBADD+=	z
+LIBADD+=	zstd
 
 .include <bsd.prog.mk>
diff --git a/usr.bin/clang/clang/Makefile b/usr.bin/clang/clang/Makefile
index 8a654020d837..efeb49f891e0 100644
--- a/usr.bin/clang/clang/Makefile
+++ b/usr.bin/clang/clang/Makefile
@@ -1,43 +1,40 @@
 # $FreeBSD$
 
 .include <src.opts.mk>
 
 PROG_CXX=	clang
 
 SRCDIR=		clang/tools/driver
 SRCS+=		cc1_main.cpp
 SRCS+=		cc1as_main.cpp
 SRCS+=		cc1gen_reproducer_main.cpp
 SRCS+=		driver.cpp
 
 CFLAGS.driver.cpp+=	-Dclang_main=main
 
 .if ${MK_SHARED_TOOLCHAIN} == "no"
 NO_SHARED?= yes
 
 .endif
 
 LINKS=	${BINDIR}/clang ${BINDIR}/clang++ \
 	${BINDIR}/clang ${BINDIR}/clang-cpp
 MLINKS=	clang.1 clang++.1 \
 	clang.1 clang-cpp.1
 .if ${MK_CLANG_IS_CC} != "no"
 SCRIPTS=CC.sh
 SCRIPTSNAME=CC
 
 LINKS+=	${BINDIR}/clang ${BINDIR}/cc \
 	${BINDIR}/clang ${BINDIR}/c++ \
 	${BINDIR}/clang ${BINDIR}/cpp
 MLINKS+= clang.1 cc.1 \
 	clang.1 c++.1 \
 	clang.1 CC.1 \
 	clang.1 cpp.1
 .endif
 
-LIBADD+=	z
-LIBADD+=	zstd
-
 # Ensure we don't add CFLAGS.clang when using GCC
 NO_TARGET_FLAGS=
 
 .include "../clang.prog.mk"
diff --git a/usr.bin/clang/llc/Makefile b/usr.bin/clang/llc/Makefile
index 42835ff00656..a4c68c6baec6 100644
--- a/usr.bin/clang/llc/Makefile
+++ b/usr.bin/clang/llc/Makefile
@@ -1,11 +1,8 @@
 # $FreeBSD$
 
 PROG_CXX=	llc
 
 SRCDIR=		llvm/tools/llc
 SRCS+=		llc.cpp
 
-LIBADD+=	z
-LIBADD+=	zstd
-
 .include "../llvm.prog.mk"
diff --git a/usr.bin/clang/lli/Makefile b/usr.bin/clang/lli/Makefile
index 0c8d621f42a6..febbebc1accf 100644
--- a/usr.bin/clang/lli/Makefile
+++ b/usr.bin/clang/lli/Makefile
@@ -1,12 +1,9 @@
 # $FreeBSD$
 
 PROG_CXX=	lli
 
 SRCDIR=		llvm/tools/lli
 SRCS+=		ExecutionUtils.cpp
 SRCS+=		lli.cpp
 
-LIBADD+=	z
-LIBADD+=	zstd
-
 .include "../llvm.prog.mk"
diff --git a/usr.bin/clang/llvm-ar/Makefile b/usr.bin/clang/llvm-ar/Makefile
index dd58fb18c417..12a3da13273f 100644
--- a/usr.bin/clang/llvm-ar/Makefile
+++ b/usr.bin/clang/llvm-ar/Makefile
@@ -1,23 +1,20 @@
 # $FreeBSD$
 
 .include <src.opts.mk>
 
 PROG_CXX=	llvm-ar
 MAN=		llvm-ar.1 llvm-ranlib.1
 
 SRCDIR=		llvm/tools/llvm-ar
 SRCS+=		llvm-ar.cpp
 
 CFLAGS.llvm-ar.cpp+=	-Dllvm_ar_main=main
 
-LIBADD+=	z
-LIBADD+=	zstd
-
 LINKS+=		${BINDIR}/llvm-ar ${BINDIR}/llvm-ranlib
 
 .if ${MK_LLVM_BINUTILS} != "no"
 LINKS+=		${BINDIR}/llvm-ar ${BINDIR}/ar ${BINDIR}/llvm-ar ${BINDIR}/ranlib
 MLINKS+=	llvm-ar.1 ar.1 llvm-ar.1 ranlib.1
 .endif
 
 .include "../llvm.prog.mk"
diff --git a/usr.bin/clang/llvm-cov/Makefile b/usr.bin/clang/llvm-cov/Makefile
index 9c6cafab0561..5bf4797d48e2 100644
--- a/usr.bin/clang/llvm-cov/Makefile
+++ b/usr.bin/clang/llvm-cov/Makefile
@@ -1,26 +1,23 @@
 # $FreeBSD$
 
 .include <src.opts.mk>
 
 PROG_CXX=	llvm-cov
 LINKS=		${BINDIR}/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
 
-LIBADD+=	z
-LIBADD+=	zstd
-
 .include "../llvm.prog.mk"
diff --git a/usr.bin/clang/llvm-dwarfdump/Makefile b/usr.bin/clang/llvm-dwarfdump/Makefile
index d5aaf812f8c4..cdf976a7c272 100644
--- a/usr.bin/clang/llvm-dwarfdump/Makefile
+++ b/usr.bin/clang/llvm-dwarfdump/Makefile
@@ -1,13 +1,10 @@
 # $FreeBSD$
 
 PROG_CXX=	llvm-dwarfdump
 
 SRCDIR=		llvm/tools/llvm-dwarfdump
 SRCS+=		SectionSizes.cpp
 SRCS+=		Statistics.cpp
 SRCS+=		llvm-dwarfdump.cpp
 
-LIBADD+=	z
-LIBADD+=	zstd
-
 .include "../llvm.prog.mk"
diff --git a/usr.bin/clang/llvm-dwarfutil/Makefile b/usr.bin/clang/llvm-dwarfutil/Makefile
index 0be0eefcea3e..cc5ebf4275fb 100644
--- a/usr.bin/clang/llvm-dwarfutil/Makefile
+++ b/usr.bin/clang/llvm-dwarfutil/Makefile
@@ -1,28 +1,25 @@
 # $FreeBSD$
 
 PROG_CXX=	llvm-dwarfutil
 
 SRCDIR=		llvm/tools/llvm-dwarfutil
 SRCS+=		DebugInfoLinker.cpp
 SRCS+=		llvm-dwarfutil.cpp
 
 .include "${SRCTOP}/lib/clang/llvm.pre.mk"
 
 CFLAGS+=	-I${.OBJDIR}
 
 INCFILE=	Options.inc
 TDFILE=		${LLVM_BASE}/${SRCDIR}/Options.td
 GENOPT=		-gen-opt-parser-defs
 ${INCFILE}: ${TDFILE}
 	${LLVM_TBLGEN} ${GENOPT} -I ${LLVM_SRCS}/include -d ${.TARGET:C/$/.d/} \
 	    -o ${.TARGET} ${TDFILE}
 TGHDRS+=	${INCFILE}
 
 DEPENDFILES+=	${TGHDRS:C/$/.d/}
 DPSRCS+=	${TGHDRS}
 CLEANFILES+=	${TGHDRS} ${TGHDRS:C/$/.d/}
 
-LIBADD+=	z
-LIBADD+=	zstd
-
 .include "../llvm.prog.mk"
diff --git a/usr.bin/clang/llvm-dwp/Makefile b/usr.bin/clang/llvm-dwp/Makefile
index c47729aea678..4732be082e70 100644
--- a/usr.bin/clang/llvm-dwp/Makefile
+++ b/usr.bin/clang/llvm-dwp/Makefile
@@ -1,12 +1,9 @@
 # $FreeBSD$
 
 PROG_CXX=	llvm-dwp
 MAN=
 
 SRCDIR=		llvm/tools/llvm-dwp
 SRCS+=		llvm-dwp.cpp
 
-LIBADD+=	z
-LIBADD+=	zstd
-
 .include "../llvm.prog.mk"
diff --git a/usr.bin/clang/llvm-extract/Makefile b/usr.bin/clang/llvm-extract/Makefile
index 7a0a5b205a4f..2cfb9a13455d 100644
--- a/usr.bin/clang/llvm-extract/Makefile
+++ b/usr.bin/clang/llvm-extract/Makefile
@@ -1,10 +1,8 @@
 # $FreeBSD$
 
 PROG_CXX=	llvm-extract
 
 SRCDIR=		llvm/tools/llvm-extract
 SRCS+=		llvm-extract.cpp
 
-LIBADD+=	z
-
 .include "../llvm.prog.mk"
diff --git a/usr.bin/clang/llvm-lto/Makefile b/usr.bin/clang/llvm-lto/Makefile
index 35e2b87fef3c..f216412b2e8a 100644
--- a/usr.bin/clang/llvm-lto/Makefile
+++ b/usr.bin/clang/llvm-lto/Makefile
@@ -1,12 +1,9 @@
 # $FreeBSD$
 
 PROG_CXX=	llvm-lto
 MAN=
 
 SRCDIR=		llvm/tools/llvm-lto
 SRCS=		llvm-lto.cpp
 
-LIBADD+=	z
-LIBADD+=	zstd
-
 .include "../llvm.prog.mk"
diff --git a/usr.bin/clang/llvm-lto2/Makefile b/usr.bin/clang/llvm-lto2/Makefile
index 37a5e7f794c0..78ca08fff06c 100644
--- a/usr.bin/clang/llvm-lto2/Makefile
+++ b/usr.bin/clang/llvm-lto2/Makefile
@@ -1,12 +1,9 @@
 # $FreeBSD$
 
 PROG_CXX=	llvm-lto2
 MAN=
 
 SRCDIR=		llvm/tools/llvm-lto2
 SRCS=		llvm-lto2.cpp
 
-LIBADD+=	z
-LIBADD+=	zstd
-
 .include "../llvm.prog.mk"
diff --git a/usr.bin/clang/llvm-mc/Makefile b/usr.bin/clang/llvm-mc/Makefile
index cb3080481607..ee9d1c41c8c1 100644
--- a/usr.bin/clang/llvm-mc/Makefile
+++ b/usr.bin/clang/llvm-mc/Makefile
@@ -1,13 +1,10 @@
 # $FreeBSD$
 
 PROG_CXX=	llvm-mc
 MAN=
 
 SRCDIR=		llvm/tools/llvm-mc
 SRCS+=		Disassembler.cpp
 SRCS+=		llvm-mc.cpp
 
-LIBADD+=	z
-LIBADD+=	zstd
-
 .include "../llvm.prog.mk"
diff --git a/usr.bin/clang/llvm-mca/Makefile b/usr.bin/clang/llvm-mca/Makefile
index 727651146c52..268ca8805a0b 100644
--- a/usr.bin/clang/llvm-mca/Makefile
+++ b/usr.bin/clang/llvm-mca/Makefile
@@ -1,25 +1,23 @@
 # $FreeBSD$
 
 PROG_CXX=	llvm-mca
 
 SRCDIR=		llvm/tools/llvm-mca
 SRCS+=		CodeRegion.cpp
 SRCS+=		CodeRegionGenerator.cpp
 SRCS+=		PipelinePrinter.cpp
 SRCS+=		Views/BottleneckAnalysis.cpp
 SRCS+=		Views/DispatchStatistics.cpp
 SRCS+=		Views/InstructionInfoView.cpp
 SRCS+=		Views/InstructionView.cpp
 SRCS+=		Views/RegisterFileStatistics.cpp
 SRCS+=		Views/ResourcePressureView.cpp
 SRCS+=		Views/RetireControlUnitStatistics.cpp
 SRCS+=		Views/SchedulerStatistics.cpp
 SRCS+=		Views/SummaryView.cpp
 SRCS+=		Views/TimelineView.cpp
 SRCS+=		llvm-mca.cpp
 
 CFLAGS+=	-I${LLVM_BASE}/${SRCDIR}
 
-LIBADD+=	z
-
 .include "../llvm.prog.mk"
diff --git a/usr.bin/clang/llvm-nm/Makefile b/usr.bin/clang/llvm-nm/Makefile
index 2c19f02e49de..d71295d0313d 100644
--- a/usr.bin/clang/llvm-nm/Makefile
+++ b/usr.bin/clang/llvm-nm/Makefile
@@ -1,36 +1,33 @@
 # $FreeBSD$
 
 .include <src.opts.mk>
 
 PROG_CXX=	llvm-nm
 
 SRCDIR=		llvm/tools/llvm-nm
 SRCS+=		llvm-nm.cpp
 
 CFLAGS.llvm-nm.cpp+=	-Dllvm_nm_main=main
 
 .include "${SRCTOP}/lib/clang/llvm.pre.mk"
 
 CFLAGS+=	-I${.OBJDIR}
 
 INCFILE=	Opts.inc
 TDFILE=		${LLVM_BASE}/${SRCDIR}/Opts.td
 GENOPT=		-gen-opt-parser-defs
 ${INCFILE}: ${TDFILE}
 	${LLVM_TBLGEN} ${GENOPT} -I ${LLVM_SRCS}/include -d ${.TARGET:C/$/.d/} \
 	    -o ${.TARGET} ${TDFILE}
 TGHDRS+=	${INCFILE}
 
 DEPENDFILES+=	${TGHDRS:C/$/.d/}
 DPSRCS+=	${TGHDRS}
 CLEANFILES+=	${TGHDRS} ${TGHDRS:C/$/.d/}
 
-LIBADD+=	z
-LIBADD+=	zstd
-
 .if ${MK_LLVM_BINUTILS} != "no"
 LINKS+=		${BINDIR}/llvm-nm ${BINDIR}/nm
 MLINKS+=	llvm-nm.1 nm.1
 .endif
 
 .include "../llvm.prog.mk"
diff --git a/usr.bin/clang/llvm-objcopy/Makefile b/usr.bin/clang/llvm-objcopy/Makefile
index 335badf81ed9..181a307457a9 100644
--- a/usr.bin/clang/llvm-objcopy/Makefile
+++ b/usr.bin/clang/llvm-objcopy/Makefile
@@ -1,42 +1,39 @@
 # $FreeBSD$
 
 .include <src.opts.mk>
 
 PROG_CXX=	llvm-objcopy
 
 SRCDIR=		llvm/tools/llvm-objcopy
 SRCS+=		ObjcopyOptions.cpp
 SRCS+=		llvm-objcopy.cpp
 
 CFLAGS.llvm-objcopy.cpp+=	-Dllvm_objcopy_main=main
 
 .include "${SRCTOP}/lib/clang/llvm.pre.mk"
 
 CFLAGS+=	-I${.OBJDIR}
 CFLAGS+=	-I${LLVM_BASE}/${SRCDIR}
 
 .for hdr in BitcodeStripOpts InstallNameToolOpts ObjcopyOpts StripOpts
 ${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/}
 
-LIBADD+=	z
-LIBADD+=	zstd
-
 LINKS=		${BINDIR}/llvm-objcopy ${BINDIR}/llvm-strip
 
 .if ${MK_LLVM_BINUTILS} != "no"
 LINKS+=		${BINDIR}/llvm-objcopy ${BINDIR}/objcopy \
 		${BINDIR}/llvm-strip ${BINDIR}/strip
 MLINKS=		llvm-objcopy.1 objcopy.1 \
 		llvm-objcopy.1 strip.1
 .endif
 
 .include "../llvm.prog.mk"
diff --git a/usr.bin/clang/llvm-objdump/Makefile b/usr.bin/clang/llvm-objdump/Makefile
index d8d80443d965..390bf40b851c 100644
--- a/usr.bin/clang/llvm-objdump/Makefile
+++ b/usr.bin/clang/llvm-objdump/Makefile
@@ -1,39 +1,36 @@
 # $FreeBSD$
 
 .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.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/}
 
-LIBADD+=	z
-LIBADD+=	zstd
-
 LINKS=		${BINDIR}/llvm-objdump ${BINDIR}/objdump
 MLINKS=		llvm-objdump.1 objdump.1
 
 .include "../llvm.prog.mk"
diff --git a/usr.bin/clang/llvm-pdbutil/Makefile b/usr.bin/clang/llvm-pdbutil/Makefile
index 5036955f775a..6e91c0424f2f 100644
--- a/usr.bin/clang/llvm-pdbutil/Makefile
+++ b/usr.bin/clang/llvm-pdbutil/Makefile
@@ -1,29 +1,27 @@
 # $FreeBSD$
 
 PROG_CXX=	llvm-pdbutil
 
 SRCDIR=		llvm/tools/llvm-pdbutil
 SRCS+=		BytesOutputStyle.cpp
 SRCS+=		DumpOutputStyle.cpp
 SRCS+=		ExplainOutputStyle.cpp
 SRCS+=		MinimalSymbolDumper.cpp
 SRCS+=		MinimalTypeDumper.cpp
 SRCS+=		PdbYaml.cpp
 SRCS+=		PrettyBuiltinDumper.cpp
 SRCS+=		PrettyClassDefinitionDumper.cpp
 SRCS+=		PrettyClassLayoutGraphicalDumper.cpp
 SRCS+=		PrettyCompilandDumper.cpp
 SRCS+=		PrettyEnumDumper.cpp
 SRCS+=		PrettyExternalSymbolDumper.cpp
 SRCS+=		PrettyFunctionDumper.cpp
 SRCS+=		PrettyTypeDumper.cpp
 SRCS+=		PrettyTypedefDumper.cpp
 SRCS+=		PrettyVariableDumper.cpp
 SRCS+=		StreamUtil.cpp
 SRCS+=		TypeReferenceTracker.cpp
 SRCS+=		YAMLOutputStyle.cpp
 SRCS+=		llvm-pdbutil.cpp
 
-LIBADD+=	z
-
 .include "../llvm.prog.mk"
diff --git a/usr.bin/clang/llvm-profdata/Makefile b/usr.bin/clang/llvm-profdata/Makefile
index b3b0d63346de..1538aacdb493 100644
--- a/usr.bin/clang/llvm-profdata/Makefile
+++ b/usr.bin/clang/llvm-profdata/Makefile
@@ -1,13 +1,10 @@
 # $FreeBSD$
 
 PROG_CXX=	llvm-profdata
 
 SRCDIR=		llvm/tools/llvm-profdata
 SRCS+=		llvm-profdata.cpp
 
 CFLAGS.llvm-profdata.cpp+=	-Dllvm_profdata_main=main
 
-LIBADD+=	z
-LIBADD+=	zstd
-
 .include "../llvm.prog.mk"
diff --git a/usr.bin/clang/llvm-readobj/Makefile b/usr.bin/clang/llvm-readobj/Makefile
index d47cdfa329fc..0c1afcae6d0b 100644
--- a/usr.bin/clang/llvm-readobj/Makefile
+++ b/usr.bin/clang/llvm-readobj/Makefile
@@ -1,49 +1,46 @@
 # $FreeBSD$
 
 .include <src.opts.mk>
 
 PROG_CXX=	llvm-readobj
 MAN=	llvm-readobj.1 llvm-readelf.1
 
 SRCDIR=		llvm/tools/llvm-readobj
 SRCS+=		ARMWinEHPrinter.cpp
 SRCS+=		COFFDumper.cpp
 SRCS+=		COFFImportDumper.cpp
 SRCS+=		ELFDumper.cpp
 SRCS+=		llvm-readobj.cpp
 SRCS+=		MachODumper.cpp
 SRCS+=		ObjDumper.cpp
 SRCS+=		WasmDumper.cpp
 SRCS+=		Win64EHDumper.cpp
 SRCS+=		WindowsResourceDumper.cpp
 SRCS+=		XCOFFDumper.cpp
 
 CFLAGS.llvm-readobj.cpp+=	-Dllvm_readobj_main=main
 
 .include "${SRCTOP}/lib/clang/llvm.pre.mk"
 
 CFLAGS+=	-I${.OBJDIR}
 
 INCFILE=	Opts.inc
 TDFILE=		${LLVM_BASE}/${SRCDIR}/Opts.td
 GENOPT=		-gen-opt-parser-defs
 ${INCFILE}: ${TDFILE}
 	${LLVM_TBLGEN} ${GENOPT} -I ${LLVM_SRCS}/include -d ${.TARGET:C/$/.d/} \
 	    -o ${.TARGET} ${TDFILE}
 TGHDRS+=	${INCFILE}
 
 DEPENDFILES+=	${TGHDRS:C/$/.d/}
 DPSRCS+=	${TGHDRS}
 CLEANFILES+=	${TGHDRS} ${TGHDRS:C/$/.d/}
 
-LIBADD+=	z
-LIBADD+=	zstd
-
 LINKS+=		${BINDIR}/llvm-readobj ${BINDIR}/llvm-readelf
 
 .if ${MK_LLVM_BINUTILS} != "no"
 LINKS+=		${BINDIR}/llvm-readelf ${BINDIR}/readelf
 MLINKS+=		llvm-readelf.1 readelf.1
 .endif
 
 .include "../llvm.prog.mk"
diff --git a/usr.bin/clang/llvm-rtdyld/Makefile b/usr.bin/clang/llvm-rtdyld/Makefile
index 6c7bd97f4bd0..37977771eddb 100644
--- a/usr.bin/clang/llvm-rtdyld/Makefile
+++ b/usr.bin/clang/llvm-rtdyld/Makefile
@@ -1,12 +1,9 @@
 # $FreeBSD$
 
 PROG_CXX=	llvm-rtdyld
 MAN=
 
 SRCDIR=		llvm/tools/llvm-rtdyld
 SRCS+=		llvm-rtdyld.cpp
 
-LIBADD+=	z
-LIBADD+=	zstd
-
 .include "../llvm.prog.mk"
diff --git a/usr.bin/clang/llvm-symbolizer/Makefile b/usr.bin/clang/llvm-symbolizer/Makefile
index 0308b58bba55..5da4840b1594 100644
--- a/usr.bin/clang/llvm-symbolizer/Makefile
+++ b/usr.bin/clang/llvm-symbolizer/Makefile
@@ -1,37 +1,34 @@
 # $FreeBSD$
 
 .include <src.opts.mk>
 
 PROG_CXX=	llvm-symbolizer
 MAN=		llvm-symbolizer.1 llvm-addr2line.1
 
 SRCDIR=		llvm/tools/llvm-symbolizer
 SRCS+=		llvm-symbolizer.cpp
 
 .include "${SRCTOP}/lib/clang/llvm.pre.mk"
 
 CFLAGS+=	-I${.OBJDIR}
 
 INCFILE=	Opts.inc
 TDFILE=		${LLVM_BASE}/${SRCDIR}/Opts.td
 GENOPT=		-gen-opt-parser-defs
 ${INCFILE}: ${TDFILE}
 	${LLVM_TBLGEN} ${GENOPT} -I ${LLVM_SRCS}/include -d ${.TARGET:C/$/.d/} \
 	    -o ${.TARGET} ${TDFILE}
 TGHDRS+=	${INCFILE}
 
 DEPENDFILES+=	${TGHDRS:C/$/.d/}
 DPSRCS+=	${TGHDRS}
 CLEANFILES+=	${TGHDRS} ${TGHDRS:C/$/.d/}
 
-LIBADD+=	z
-LIBADD+=	zstd
-
 LINKS+=		${BINDIR}/llvm-symbolizer ${BINDIR}/llvm-addr2line
 
 .if ${MK_LLVM_BINUTILS} != "no"
 LINKS+=		${BINDIR}/llvm-symbolizer ${BINDIR}/addr2line
 MLINKS+=	llvm-addr2line.1 addr2line.1
 .endif
 
 .include "../llvm.prog.mk"
diff --git a/usr.bin/clang/llvm-xray/Makefile b/usr.bin/clang/llvm-xray/Makefile
index 1be3eb059e81..5e84483e4f6b 100644
--- a/usr.bin/clang/llvm-xray/Makefile
+++ b/usr.bin/clang/llvm-xray/Makefile
@@ -1,21 +1,18 @@
 # $FreeBSD$
 
 PROG_CXX=	llvm-xray
 MAN=
 
 SRCDIR=		llvm/tools/llvm-xray
 SRCS+=		func-id-helper.cpp
 SRCS+=		llvm-xray.cpp
 SRCS+=		xray-account.cpp
 SRCS+=		xray-color-helper.cpp
 SRCS+=		xray-converter.cpp
 SRCS+=		xray-extract.cpp
 SRCS+=		xray-graph-diff.cpp
 SRCS+=		xray-graph.cpp
 SRCS+=		xray-registry.cpp
 SRCS+=		xray-stacks.cpp
 
-LIBADD+=	z
-LIBADD+=	zstd
-
 .include "../llvm.prog.mk"
diff --git a/usr.bin/clang/llvm.prog.mk b/usr.bin/clang/llvm.prog.mk
index 56698c4138d3..053450f38e95 100644
--- a/usr.bin/clang/llvm.prog.mk
+++ b/usr.bin/clang/llvm.prog.mk
@@ -1,31 +1,33 @@
 # $FreeBSD$
 
 .include "${SRCTOP}/lib/clang/llvm.pre.mk"
 
 CFLAGS+=	-I${OBJTOP}/lib/clang/libllvm
 
 .include "${SRCTOP}/lib/clang/llvm.build.mk"
 
 # Special case for the bootstrap-tools phase.
 .if (defined(TOOLS_PREFIX) || ${MACHINE} == "host") && \
     (${PROG_CXX} == "clang-tblgen" || ${PROG_CXX} == "lldb-tblgen" || \
      ${PROG_CXX} == "llvm-tblgen")
 LIBDEPS+=	llvmminimal
 .else
 LIBDEPS+=	llvm
 .endif
 
 .for lib in ${LIBDEPS}
 DPADD+=		${OBJTOP}/lib/clang/lib${lib}/lib${lib}.a
 LDADD+=		${OBJTOP}/lib/clang/lib${lib}/lib${lib}.a
 .endfor
 
 PACKAGE=	clang
 
 .if ${.MAKE.OS} == "FreeBSD" || !defined(BOOTSTRAPPING)
 LIBADD+=	execinfo
 LIBADD+=	ncursesw
 .endif
 LIBADD+=	pthread
+LIBADD+=	z
+LIBADD+=	zstd
 
 .include <bsd.prog.mk>
diff --git a/usr.bin/clang/opt/Makefile b/usr.bin/clang/opt/Makefile
index 27e0395942f6..ca209cec45ac 100644
--- a/usr.bin/clang/opt/Makefile
+++ b/usr.bin/clang/opt/Makefile
@@ -1,14 +1,11 @@
 # $FreeBSD$
 
 PROG_CXX=	opt
 
 SRCDIR=		llvm/tools/opt
 SRCS+=		AnalysisWrappers.cpp
 SRCS+=		BreakpointPrinter.cpp
 SRCS+=		NewPMDriver.cpp
 SRCS+=		opt.cpp
 
-LIBADD+=	z
-LIBADD+=	zstd
-
 .include "../llvm.prog.mk"