git: f7ea22e21153 - main - OptionalObsoleteFiles: move /usr/bin/CC to MK_TOOLCHAIN section

The branch main has been updated by emaste:

URL: https://cgit.FreeBSD.org/src/commit/?id=f7ea22e2115329b7a4f2c6620e59e644f509a4ca

commit f7ea22e2115329b7a4f2c6620e59e644f509a4ca
Author:     Ed Maste <emaste@FreeBSD.org>
AuthorDate: 2021-12-01 21:38:10 +0000
Commit:     Ed Maste <emaste@FreeBSD.org>
CommitDate: 2021-12-01 21:43:44 +0000

    OptionalObsoleteFiles: move /usr/bin/CC to MK_TOOLCHAIN section
    
    /usr/bin/CC is installed by usr.bin/clang/clang/Makefile, as with
    /usr/bin/cc, /usr/bin/cpp, etc., and is not controlled by MK_CXX.
    Move it to the same section as those tools.
    
    (It may be that these should all be under
    MK_TOOLCHAIN == no || MK_CLANG_IS_CC == no, but that seems like
    unnecessary complexity.)
    
    Sponsored by:   The FreeBSD Foundation
---
 tools/build/mk/OptionalObsoleteFiles.inc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/build/mk/OptionalObsoleteFiles.inc b/tools/build/mk/OptionalObsoleteFiles.inc
index 155c4fc82db6..d7531e188985 100644
--- a/tools/build/mk/OptionalObsoleteFiles.inc
+++ b/tools/build/mk/OptionalObsoleteFiles.inc
@@ -1642,7 +1642,6 @@ OLD_DIRS+=usr/include/fs/cuse
 
 # devd(8) not listed here on purpose
 .if ${MK_CXX} == no
-OLD_FILES+=usr/bin/CC
 OLD_FILES+=usr/bin/c++
 .endif
 
@@ -8898,6 +8897,7 @@ OLD_FILES+=usr/share/man/man8/tftpd.8.gz
 .endif
 
 .if ${MK_TOOLCHAIN} == no
+OLD_FILES+=usr/bin/CC
 OLD_FILES+=usr/bin/addr2line
 OLD_FILES+=usr/bin/as
 OLD_FILES+=usr/bin/byacc