diff --git Makefile.inc1 Makefile.inc1
index 32579bbf5234..026ee6ef8677 100644
--- Makefile.inc1
+++ Makefile.inc1
@@ -666,7 +666,7 @@ BSARGS= 	DESTDIR= \
 BMAKE=		\
 		${BMAKEENV} ${MAKE} ${WORLD_FLAGS} -f Makefile.inc1 \
 		${BSARGS}
-.if empty(.MAKEOVERRIDES:MMK_LLVM_TARGET_ALL)
+.if empty(.MAKEOVERRIDES:MMK_LLVM_TARGET_ALL) && !make(*toolchain*)
 BMAKE+=		MK_LLVM_TARGET_ALL=no
 .endif