Index: head/lib/libclang_rt/Makefile.inc
===================================================================
--- head/lib/libclang_rt/Makefile.inc	(revision 325441)
+++ head/lib/libclang_rt/Makefile.inc	(revision 325442)
@@ -1,32 +1,32 @@
 # $FreeBSD$
 
 .include <src.opts.mk>
 
 CRTARCH=	${MACHINE_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
-.if ${COMPILER_VERSION} >= 30700
+CXXFLAGS+=	-fno-rtti
+.if ${COMPILER_TYPE} == clang && ${COMPILER_VERSION} >= 30700
 CFLAGS+=	-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
Index: head/lib/libclang_rt/profile/Makefile
===================================================================
--- head/lib/libclang_rt/profile/Makefile	(revision 325441)
+++ head/lib/libclang_rt/profile/Makefile	(revision 325442)
@@ -1,25 +1,25 @@
 # $FreeBSD$
 
 .include <bsd.init.mk>
 
 LIB=		clang_rt.profile-${CRTARCH}
 
 # This is needed for --coverage
-CFLAGS+=	-fvisibility=default
+CXXFLAGS+=	-fvisibility=default
 
 SRCS+=		profile/GCDAProfiling.c
 SRCS+=		profile/InstrProfiling.c
 SRCS+=		profile/InstrProfilingBuffer.c
 SRCS+=		profile/InstrProfilingFile.c
 SRCS+=		profile/InstrProfilingMerge.c
 SRCS+=		profile/InstrProfilingMergeFile.c
 SRCS+=		profile/InstrProfilingNameVar.c
 SRCS+=		profile/InstrProfilingPlatformDarwin.c
 SRCS+=		profile/InstrProfilingPlatformLinux.c
 SRCS+=		profile/InstrProfilingPlatformOther.c
 SRCS+=		profile/InstrProfilingRuntime.cc
 SRCS+=		profile/InstrProfilingUtil.c
 SRCS+=		profile/InstrProfilingValue.c
 SRCS+=		profile/InstrProfilingWriter.c
 
 .include <bsd.lib.mk>