Index: ObsoleteFiles.inc
===================================================================
--- ObsoleteFiles.inc
+++ ObsoleteFiles.inc
@@ -38,6 +38,13 @@
 #   xargs -n1 | sort | uniq -d;
 # done
 
+# 201908XX: clang/clang++/clang-cpp hardlinks removed
+OLD_FILES+=usr/bin/clang
+OLD_FILES+=usr/bin/clang++
+OLD_FILES+=usr/bin/clang-cpp
+OLD_FILES+=usr/share/man/man1/clang.1.gz
+OLD_FILES+=usr/share/man/man1/clang++.1.gz
+OLD_FILES+=usr/share/man/man1/clang-cpp.1.gz
 # 20190708: vm_page_hold() and _unhold() removed
 OLD_FILES+=usr/share/man/man9/vm_page_hold.9.gz
 # 20190618: sys/capability.h removed (sys/capsicum.h is the one to use)
Index: usr.bin/clang/clang/Makefile
===================================================================
--- usr.bin/clang/clang/Makefile
+++ usr.bin/clang/clang/Makefile
@@ -2,7 +2,7 @@
 
 .include <src.opts.mk>
 
-PROG_CXX=	clang
+PROG_CXX=	cc
 
 SRCDIR=		tools/clang/tools/driver
 SRCS+=		cc1_main.cpp
@@ -18,21 +18,16 @@
 .endif
 .endif
 
-LINKS=	${BINDIR}/clang ${BINDIR}/clang++ \
-	${BINDIR}/clang ${BINDIR}/clang-cpp
-MLINKS=	clang.1 clang++.1 \
-	clang.1 clang-cpp.1
 .if ${MK_CLANG_IS_CC} != "no"
 SCRIPTS=CC.sh
 SCRIPTSNAME=CC
 
-LINKS+=	${BINDIR}/clang ${BINDIR}/cc \
-	${BINDIR}/clang ${BINDIR}/c++ \
-	${BINDIR}/clang ${BINDIR}/cpp
-MLINKS+= clang.1 cc.1 \
-	clang.1 c++.1 \
-	clang.1 CC.1 \
-	clang.1 cpp.1
+LINKS+=	${BINDIR}/cc ${BINDIR}/c++ \
+	${BINDIR}/cc ${BINDIR}/cpp
+MLINKS+= \
+	cc.1 c++.1 \
+	cc.1 CC.1 \
+	cc.1 cpp.1
 .endif
 
 LIBADD+=	z