Index: head/devel/flang/Makefile
===================================================================
--- head/devel/flang/Makefile
+++ head/devel/flang/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	flang
-DISTVERSION=	3.9-20170518
+DISTVERSION=	3.9-20170522
 PORTREVISION=	1
 CATEGORIES=	devel
 
@@ -22,6 +22,9 @@
 ONLY_FOR_ARCHS=	amd64
 ONLY_FOR_ARCHS_REASON_amd64=	for now only builds and is supported on amd64
 
+OPTIONS_DEFINE=	TESTS
+TESTS_DESC=	build unit tests for flang
+
 USE_LDCONFIG=	${PREFIX}/flang/lib
 USES=		cmake:outsource compiler:c++11-lib libedit perl5 tar:xz \
 		shebangfix
@@ -30,7 +33,7 @@
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	flang-compiler
-GH_TAGNAME=	a9ccdd7
+GH_TAGNAME=	5af07d4
 
 CMAKE_ARGS+=	-DLLVM_CONFIG=${LOCALBASE}/bin/llvm-config39 \
 		-DCMAKE_CXX_COMPILER=${LOCALBASE}flang/bin/clang++ \
@@ -39,6 +42,11 @@
 
 CMAKE_INSTALL_PREFIX=	${PREFIX}/flang
 
+.include <bsd.port.options.mk>
+.if ${PORT_OPTIONS:MTESTS}
+CMAKE_ARGS+=	-DFLANG_INCLUDE_TESTS=ON
+.endif
+
 MAKE_JOBS_UNSAFE=	yes
 
 post-patch:
Index: head/devel/flang/distinfo
===================================================================
--- head/devel/flang/distinfo
+++ head/devel/flang/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1495121602
-SHA256 (flang-compiler-flang-3.9-20170518-a9ccdd7_GH0.tar.gz) = ddcd8d00bf4429ca63a47d6509dc4c77708afbeda90133121bdb63505fa005b9
-SIZE (flang-compiler-flang-3.9-20170518-a9ccdd7_GH0.tar.gz) = 3574207
+TIMESTAMP = 1495501996
+SHA256 (flang-compiler-flang-3.9-20170522-5af07d4_GH0.tar.gz) = e0398ba2e01d14dbd23b6cd9f07b66c0072a23468a48490003bbb3dff49895e5
+SIZE (flang-compiler-flang-3.9-20170522-5af07d4_GH0.tar.gz) = 3578945
Index: head/devel/flang/files/flang.in
===================================================================
--- head/devel/flang/files/flang.in
+++ head/devel/flang/files/flang.in
@@ -1,2 +1,2 @@
 #!/bin/sh
-%%PREFIX%%/flang/bin/flang -L%%PREFIX%%/flang/lib -lflang -lflangmain -lflangrti -lexecinfo $@
+%%PREFIX%%/flang/bin/flang -L%%PREFIX%%/flang/lib -lflang -lflangmain -lflangrti -lompstub -lexecinfo -I%%PREFIX%%/flang/include $@