Index: projects/runtime-coverage/lib/libclang_rt/Makefile.inc
===================================================================
--- projects/runtime-coverage/lib/libclang_rt/Makefile.inc	(revision 324893)
+++ projects/runtime-coverage/lib/libclang_rt/Makefile.inc	(revision 324894)
@@ -1,32 +1,32 @@
 # $FreeBSD$
 
 .include <src.opts.mk>
 
 CRTARCH=	${TARGET_CPUARCH:C/amd64/x86_64/}
 CRTSRC=		${SRCTOP}/contrib/compiler-rt
 
 .PATH:		${CRTSRC}/lib
 
 CLANGDIR=	/usr/lib/clang/5.0.0
 LIBDIR=		${CLANGDIR}/lib/freebsd
 
 NO_PIC=
 MK_PROFILE=	no
 
 WARNS?=		0
 
 SSP_CFLAGS=
 CFLAGS+=	-DNDEBUG
 CFLAGS+=	${PICFLAG}
 CFLAGS+=	-fno-builtin
 CFLAGS+=	-fno-exceptions
-CFLAGS+=	-fno-rtti
+CXXFLAGS+=	-fno-rtti
 .if ${COMPILER_VERSION} >= 30700
-CFLAGS+=	-fno-sanitize=safe-stack
+CFLAGS.clang+=	-fno-sanitize=safe-stack
 .endif
 CFLAGS+=	-fno-stack-protector
 CFLAGS+=	-funwind-tables
-CFLAGS+=	-fvisibility-inlines-hidden
-CFLAGS+=	-fvisibility=hidden
+CXXFLAGS+=	-fvisibility-inlines-hidden
+CXXFLAGS+=	-fvisibility=hidden
 CFLAGS+=	-I${CRTSRC}/lib
 CXXFLAGS+=	-std=c++11