Index: ObsoleteFiles.inc =================================================================== --- ObsoleteFiles.inc +++ ObsoleteFiles.inc @@ -38,6 +38,9 @@ # xargs -n1 | sort | uniq -d; # done +# 20150221: Removed the non-standard CC alias for c++ +OLD_FILES+=usr/bin/CC +OLD_FILES+=usr/share/man/man1/CC.1.gz # 20150217: Removed remnants of ar(4) driver OLD_FILES+=usr/include/sys/dev/ic/hd64570.h # 20150212: /usr/games moving into /usr/bin 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 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 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