Index: lib/clang/include/llvm/Config/config.h
===================================================================
--- lib/clang/include/llvm/Config/config.h
+++ lib/clang/include/llvm/Config/config.h
@@ -244,7 +244,7 @@
 #define HAVE_SYS_TYPES_H 1
 
 /* Define if the setupterm() function is supported this platform. */
-#if !defined(LLVM_BOOTSTRAPPING)
+#if defined(__FreeBSD__)
 /*
  * This is only needed for terminalHasColors(). When disabled LLVM falls back
  * to checking a list of TERM prefixes which is sufficient for a bootstrap tool.
Index: lib/clang/llvm.build.mk
===================================================================
--- lib/clang/llvm.build.mk
+++ lib/clang/llvm.build.mk
@@ -100,7 +100,6 @@
 
 CFLAGS+=	-ffunction-sections
 CFLAGS+=	-fdata-sections
-.include <bsd.linker.mk>
 .if ${LINKER_TYPE} == "mac"
 LDFLAGS+=	-Wl,-dead_strip
 .else
Index: tools/build/make.py
===================================================================
--- tools/build/make.py
+++ tools/build/make.py
@@ -168,7 +168,7 @@
                         help="Print information on inferred env vars")
     parser.add_argument("--bootstrap-toolchain", action="store_true",
                         help="Bootstrap the toolchain instead of using an "
-                             "external one (experimetal and not recommended)")
+                             "external one (experimental and not recommended)")
     parser.add_argument("--clean", action="store_true",
                         help="Do a clean rebuild instead of building with "
                              "-DWITHOUT_CLEAN")
Index: usr.bin/clang/Makefile
===================================================================
--- usr.bin/clang/Makefile
+++ usr.bin/clang/Makefile
@@ -2,13 +2,19 @@
 
 .include <src.opts.mk>
 
+.if ${MK_CLANG} != "no"
 SUBDIR+=	clang
-SUBDIR+=	clang-tblgen
-SUBDIR+=	llvm-tblgen
+.endif
 
+.if ${MK_CLANG_EXTRAS} != "no"
+# {llvm,clang,lldb}-tablegen is only needed to build plugins for the installed
+# clang/lldb and is therefore off by default to save build time.
+SUBDIR+=	llvm-tblgen
+SUBDIR+=	clang-tblgen
 .if ${MK_LLDB} != "no"
 SUBDIR+=	lldb-tblgen
 .endif
+.endif
 
 .if !defined(TOOLS_PREFIX)
 SUBDIR+=	llvm-ar
Index: usr.bin/clang/clang.prog.mk
===================================================================
--- usr.bin/clang/clang.prog.mk
+++ usr.bin/clang/clang.prog.mk
@@ -19,8 +19,6 @@
 
 .if ${.MAKE.OS} == "FreeBSD" || !defined(BOOTSTRAPPING)
 LIBADD+=	execinfo
-.endif
-.if !defined(BOOTSTRAPPING)
 LIBADD+=	ncursesw
 .endif
 LIBADD+=	pthread
Index: usr.bin/clang/lld/Makefile
===================================================================
--- usr.bin/clang/lld/Makefile
+++ usr.bin/clang/lld/Makefile
@@ -104,8 +104,6 @@
 
 .if ${.MAKE.OS} == "FreeBSD" || !defined(BOOTSTRAPPING)
 LIBADD+=	execinfo
-.endif
-.if !defined(BOOTSTRAPPING)
 LIBADD+=	ncursesw
 .endif
 LIBADD+=	pthread
Index: usr.bin/clang/llvm.prog.mk
===================================================================
--- usr.bin/clang/llvm.prog.mk
+++ usr.bin/clang/llvm.prog.mk
@@ -24,8 +24,6 @@
 
 .if ${.MAKE.OS} == "FreeBSD" || !defined(BOOTSTRAPPING)
 LIBADD+=	execinfo
-.endif
-.if !defined(BOOTSTRAPPING)
 LIBADD+=	ncursesw
 .endif
 LIBADD+=	pthread