diff --git a/devel/libdispatch/Makefile b/devel/libdispatch/Makefile
index 1614b7c56b58..e8c4fd09609e 100644
--- a/devel/libdispatch/Makefile
+++ b/devel/libdispatch/Makefile
@@ -1,19 +1,32 @@
 PORTNAME=	libdispatch
 DISTVERSION=	5.5
 PORTEPOCH=	1
 CATEGORIES=	devel
 
 MAINTAINER=	fluffy@FreeBSD.org
 COMMENT=	Grand Central Dispatch API support library
 
 LICENSE=	APACHE20
 
-USES=		cmake compiler:c++17-lang
+USES=		cmake
 USE_LDCONFIG=	yes
+USE_CXXSTD=	c++17
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	apple
 GH_PROJECT=	swift-corelibs-libdispatch
 GH_TAGNAME=	swift-${DISTVERSION}-RELEASE
 
+.include <bsd.port.options.mk>
+
+.if ${OSVERSION} > 1400000
+USES+=	llvm:build
+CC=	${_LLVM_MK_PREFIX}/bin/clang
+CPP=	${_LLVM_MK_PREFIX}/bin/clang-cpp
+CXX=	${_LLVM_MK_PREFIX}/bin/clang++
+#LD?=	${_LLVM_MK_PREFIX}/bin/ld
+.else
+USES+=	compiler:c++17-lang
+.endif
+
 .include <bsd.port.mk>