diff --git a/tools/build/depend-cleanup.sh b/tools/build/depend-cleanup.sh
index c12c8e203324..24bbd07f03c4 100755
--- a/tools/build/depend-cleanup.sh
+++ b/tools/build/depend-cleanup.sh
@@ -1,173 +1,187 @@
 #!/bin/sh
 #
 #
 # Our current make(1)-based approach to dependency tracking cannot cope with
 # certain source tree changes, including:
 # - removing source files
 # - replacing generated files with files committed to the tree
 # - changing file extensions (e.g. a C source file rewritten in C++)
 #
 # We handle those cases here in an ad-hoc fashion by looking for the known-
 # bad case in the main .depend file, and if found deleting all of the related
 # .depend files (including for example the lib32 version).
 #
 # These tests increase the build time (albeit by a small amount), so they
 # should be removed once enough time has passed and it is extremely unlikely
 # anyone would try a NO_CLEAN build against an object tree from before the
 # related change.  One year should be sufficient.
 
 set -e
 set -u
 
 warn()
 {
 	echo "$(basename "$0"):" "$@" >&2
 }
 
 err()
 {
 	warn "$@"
 	exit 1
 }
 
 usage()
 {
 	echo "usage: $(basename $0) [-v] [-n] objtop" >&2
 }
 
 VERBOSE=
 PRETEND=
 while getopts vn o; do
 	case "$o" in
 	v)
 		VERBOSE=1
 		;;
 	n)
 		PRETEND=1
 		;;
 	*)
 		usage
 		exit 1
 		;;
 	esac
 done
 shift $((OPTIND-1))
 
 if [ $# -ne 1 ]; then
 	usage
 	exit 1
 fi
 
 OBJTOP=$1
 shift
 if [ ! -d "$OBJTOP" ]; then
 	err "$OBJTOP: Not a directory"
 fi
 
 if [ -z "${MACHINE+set}" ]; then
 	err "MACHINE not set"
 fi
 
 if [ -z "${MACHINE_ARCH+set}" ]; then
 	err "MACHINE_ARCH not set"
 fi
 
 # XXX: _ALL_libcompats not MFC'd in Makefile.inc1
 ALL_libcompats=32
 
 run()
 {
 	if [ "$VERBOSE" ]; then
 		echo "$@"
 	fi
 	if ! [ "$PRETEND" ]; then
 		"$@"
 	fi
 }
 
 # $1 directory
 # $2 source filename w/o extension
 # $3 source extension
 # $4 optional regex for egrep -w
 clean_dep()
 {
 	for libcompat in "" $ALL_libcompats; do
 		dirprfx=${libcompat:+obj-lib${libcompat}/}
 		if egrep -qw "${4:-$2\.$3}" "$OBJTOP"/$dirprfx$1/.depend.$2.*o 2>/dev/null; then
 			echo "Removing stale ${libcompat:+lib${libcompat} }dependencies and objects for $2.$3"
 			run rm -f \
 			    "$OBJTOP"/$dirprfx$1/.depend.$2.* \
 			    "$OBJTOP"/$dirprfx$1/$2.*o
 		fi
 	done
 }
 
 # Date      Rev      Description
 # 20200310  r358851  rename of openmp's ittnotify_static.c to .cpp
 clean_dep lib/libomp ittnotify_static c
 # 20200414  r359930  closefrom
 clean_dep lib/libc   closefrom S
 
 # 20200826  r364746  OpenZFS merge, apply a big hammer (remove whole tree)
 if [ -e "$OBJTOP"/cddl/lib/libzfs/.depend.libzfs_changelist.o ] && \
     egrep -qw "cddl/contrib/opensolaris/lib/libzfs/common/libzfs_changelist.c" \
     "$OBJTOP"/cddl/lib/libzfs/.depend.libzfs_changelist.o; then
 	echo "Removing old ZFS tree"
 	for libcompat in "" $ALL_libcompats; do
 		dirprfx=${libcompat:+obj-lib${libcompat}/}
 		run rm -rf "$OBJTOP"/${dirprfx}cddl
 	done
 fi
 
 # 20200916  WARNS bumped, need bootstrapped crunchgen stubs
 if [ -e "$OBJTOP"/rescue/rescue/rescue.c ] && \
     ! grep -q 'crunched_stub_t' "$OBJTOP"/rescue/rescue/rescue.c; then
 	echo "Removing old rescue(8) tree"
 	run rm -rf "$OBJTOP"/rescue/rescue
 fi
 
 # 20210105  fda7daf06301   pfctl gained its own version of pf_ruleset.c
 if [ -e "$OBJTOP"/sbin/pfctl/.depend.pf_ruleset.o ] && \
     egrep -qw "sys/netpfil/pf/pf_ruleset.c" \
     "$OBJTOP"/sbin/pfctl/.depend.pf_ruleset.o; then
 	echo "Removing old pf_ruleset dependecy file"
 	run rm -rf "$OBJTOP"/sbin/pfctl/.depend.pf_ruleset.o
 fi
 
 # 20210108  821aa63a0940   non-widechar version of ncurses removed
 if [ -e "$OBJTOP"/lib/ncurses/ncursesw ]; then
 	echo "Removing stale ncurses objects"
 	for libcompat in "" $ALL_libcompats; do
 		dirprfx=${libcompat:+obj-lib${libcompat}/}
 		run rm -rf "$OBJTOP"/${dirprfx}lib/ncurses
 	done
 fi
 
 # 20210608  f20893853e8e    move from atomic.S to atomic.c
 clean_dep   cddl/lib/libspl atomic S
 # 20211207  cbdec8db18b5    switch to libthr-friendly pdfork
 clean_dep   lib/libc        pdfork S
 
 # 20220524  68fe988a40ca    kqueue_test binary replaced shell script
 if stat "$OBJTOP"/tests/sys/kqueue/libkqueue/*kqtest* \
     "$OBJTOP"/tests/sys/kqueue/libkqueue/.depend.kqtest* >/dev/null 2>&1; then
 	echo "Removing old kqtest"
 	run rm -f "$OBJTOP"/tests/sys/kqueue/libkqueue/.depend.* \
 	   "$OBJTOP"/tests/sys/kqueue/libkqueue/*
 fi
 
 # 20230110  bc42155199b5    usr.sbin/zic/zic -> usr.sbin/zic
 if [ -d "$OBJTOP"/usr.sbin/zic/zic ] ; then
 	echo "Removing old zic directory"
 	run rm -rf "$OBJTOP"/usr.sbin/zic/zic
 fi
 
 # 20241018  5deeebd8c6ca   Merge llvm-project release/19.x llvmorg-19.1.2-0-g7ba7d8e2f7b6
 p="$OBJTOP"/lib/clang/libclang/clang/Basic
 f="$p"/arm_mve_builtin_sema.inc
 if [ -e "$f" ]; then
 	if grep -q SemaBuiltinConstantArgRange "$f"; then
 		echo "Removing pre-llvm19 clang-tblgen output"
 		run rm -f "$p"/*.inc
 	fi
 fi
+
+# 20250425  2e47f35be5dc    libllvm, libclang and liblldb became shared libraries
+if [ -f "$OBJTOP"/lib/clang/libllvm/libllvm.a ]; then
+	echo "Removing old static libllvm library"
+        run rm -f "$OBJTOP"/lib/clang/libllvm/libllvm.a
+fi
+if [ -f "$OBJTOP"/lib/clang/libclang/libclang.a ]; then
+	echo "Removing old static libclang library"
+        run rm -f "$OBJTOP"/lib/clang/libclang/libclang.a
+fi
+if [ -f "$OBJTOP"/lib/clang/liblldb/liblldb.a ]; then
+	echo "Removing old static liblldb library"
+        run rm -f "$OBJTOP"/lib/clang/liblldb/liblldb.a
+fi