Index: ObsoleteFiles.inc
===================================================================
--- ObsoleteFiles.inc
+++ ObsoleteFiles.inc
@@ -38,6 +38,9 @@
 #   xargs -n1 | sort | uniq -d;
 # done
 
+# 2015mmdd: Removed the non-standard CC alias for c++
+OLD_FILES+=usr/bin/CC
+OLD_FILES+=usr/share/man/man1/CC.1.gz
 # 20150525: new clang import which bumps version from 3.6.0 to 3.6.1.
 OLD_FILES+=usr/lib/clang/3.6.0/include/__stddef_max_align_t.h
 OLD_FILES+=usr/lib/clang/3.6.0/include/__wmmintrin_aes.h
Index: gnu/usr.bin/cc/c++/Makefile
===================================================================
--- gnu/usr.bin/cc/c++/Makefile
+++ gnu/usr.bin/cc/c++/Makefile
@@ -16,7 +16,6 @@
 
 .if ${MK_CLANG_IS_CC} == "no"
 LINKS=	${BINDIR}/g++ ${BINDIR}/c++
-LINKS+=	${BINDIR}/g++ ${BINDIR}/CC
 .endif
 
 .include <bsd.prog.mk>
Index: gnu/usr.bin/cc/cc/Makefile
===================================================================
--- gnu/usr.bin/cc/cc/Makefile
+++ gnu/usr.bin/cc/cc/Makefile
@@ -16,7 +16,7 @@
 MLINKS=	gcc.1 g++.1
 .if ${MK_CLANG_IS_CC} == "no"
 LINKS=	${BINDIR}/gcc ${BINDIR}/cc
-MLINKS+= gcc.1 cc.1 gcc.1 c++.1 gcc.1 CC.1
+MLINKS+= gcc.1 cc.1 gcc.1 c++.1 gcc.1
 .endif
 
 .include <bsd.prog.mk>
Index: usr.bin/clang/clang/Makefile
===================================================================
--- usr.bin/clang/clang/Makefile
+++ usr.bin/clang/clang/Makefile
@@ -20,11 +20,9 @@
 .if ${MK_CLANG_IS_CC} != "no"
 LINKS+=	${BINDIR}/clang ${BINDIR}/cc \
 	${BINDIR}/clang ${BINDIR}/c++ \
-	${BINDIR}/clang ${BINDIR}/CC \
 	${BINDIR}/clang ${BINDIR}/cpp
 MLINKS+= clang.1 cc.1 \
 	clang.1 c++.1 \
-	clang.1 CC.1 \
 	clang.1 cpp.1
 .endif