diff --git a/ObsoleteFiles.inc b/ObsoleteFiles.inc
--- a/ObsoleteFiles.inc
+++ b/ObsoleteFiles.inc
@@ -40,6 +40,11 @@
 #   xargs -n1 | sort | uniq -d;
 # done
 
+# 20210906: stop installing {llvm,clang,lldb}-tblgen
+OLD_FILES+=usr/bin/llvm-tblgen
+OLD_FILES+=usr/bin/clang-tblgen
+OLD_FILES+=usr/bin/lldb-tblgen
+
 # 20210810: remove Pentium-related man pages and references
 OLD_FILES+=usr/share/man/man3/pmc.p4.3.gz
 OLD_FILES+=usr/share/man/man3/pmc.p5.3.gz
diff --git a/usr.bin/clang/Makefile b/usr.bin/clang/Makefile
--- a/usr.bin/clang/Makefile
+++ b/usr.bin/clang/Makefile
@@ -2,12 +2,8 @@
 
 .include <src.opts.mk>
 
+.if ${MK_CLANG} != "no"
 SUBDIR+=	clang
-SUBDIR+=	clang-tblgen
-SUBDIR+=	llvm-tblgen
-
-.if ${MK_LLDB} != "no"
-SUBDIR+=	lldb-tblgen
 .endif
 
 .if !defined(TOOLS_PREFIX)