Index: Mk/Uses/compiler.mk
===================================================================
--- Mk/Uses/compiler.mk
+++ Mk/Uses/compiler.mk
@@ -161,10 +161,11 @@
 CXX=	clang++
 CHOSEN_COMPILER_TYPE=	clang
 .else
-BUILD_DEPENDS+=	${LOCALBASE}/bin/clang36:lang/clang36
-CPP=	${LOCALBASE}/bin/clang-cpp36
-CC=	${LOCALBASE}/bin/clang36
-CXX=	${LOCALBASE}/bin/clang++36
+_LLVMVER=	40
+BUILD_DEPENDS+=	${LOCALBASE}/bin/clang${_LLVMVER}:devel/llvm${_LLVMVER}
+CPP=	${LOCALBASE}/bin/clang-cpp${_LLVMVER}
+CC=	${LOCALBASE}/bin/clang${_LLVMVER}
+CXX=	${LOCALBASE}/bin/clang++${_LLVMVER}
 CHOSEN_COMPILER_TYPE=	clang
 .endif
 .endif