diff --git a/tools/Makefile b/tools/Makefile
index 9c3407916bca..4568dec08168 100644
--- a/tools/Makefile
+++ b/tools/Makefile
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.193 2018/02/18 01:06:24 uwe Exp $
+#	$NetBSD: Makefile,v 1.194 2018/05/09 13:21:27 joerg Exp $
 
 .include <bsd.own.mk>
 .include <bsd.endian.mk>
@@ -124,8 +124,11 @@ SUBDIR+= stat .WAIT config
 SUBDIR+= \
 	llvm .WAIT \
 	llvm-lib/libLLVMDemangle llvm-lib/libLLVMSupport llvm-lib/libLLVMTableGen .WAIT \
-	llvm-tblgen llvm-clang-tblgen .WAIT \
-	llvm-include .WAIT \
+	llvm-tblgen llvm-clang-tblgen
+.endif
+.if ${MKLLVM} != "no" && !defined(EXTERNAL_TOOLCHAIN)
+SUBDIR+= \
+	.WAIT llvm-include .WAIT \
 	llvm-lib .WAIT \
 	llvm-clang
 . if ${MKLLD} != "no"