diff --git a/Makefile.inc1 b/Makefile.inc1 index c14d801254c4..112f335d7c11 100644 --- a/Makefile.inc1 +++ b/Makefile.inc1 @@ -759,7 +759,6 @@ TMAKE= \ # TOOLS_PREFIX set in BMAKE XMAKE= ${BMAKE} \ TARGET=${TARGET} TARGET_ARCH=${TARGET_ARCH} \ - MK_CLANG_IS_CC=${MK_CLANG_BOOTSTRAP} \ MK_LLDB=no \ MK_LLVM_BINUTILS=no \ MK_TESTS=no diff --git a/UPDATING b/UPDATING index 5e94336a82f2..3782692c2a49 100644 --- a/UPDATING +++ b/UPDATING @@ -27,6 +27,10 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 14.x IS SLOW: world, or to merely disable the most expensive debugging functionality at runtime, run "ln -s 'abort:false,junk:false' /etc/malloc.conf".) +20221121: + The WITHOUT_CLANG_IS_CC option has been removed. When Clang is enabled + it is always installed as /usr/bin/cc (and c++, cpp). + 20221026: Some programs have been moved into separate packages. It is recommended for pkgbase users to do: diff --git a/share/man/man5/src.conf.5 b/share/man/man5/src.conf.5 index e6a1fc52a23e..132a05065bd0 100644 --- a/share/man/man5/src.conf.5 +++ b/share/man/man5/src.conf.5 @@ -1,6 +1,6 @@ .\" DO NOT EDIT-- this file is @generated by tools/build/options/makeman. .\" $FreeBSD$ -.Dd November 18, 2022 +.Dd November 21, 2022 .Dt SRC.CONF 5 .Os .Sh NAME @@ -386,12 +386,6 @@ Build clang-format. .It Va WITHOUT_CLANG_FULL Avoid building the ARCMigrate, Rewriter and StaticAnalyzer components of the Clang C/C++ compiler. -.It Va WITHOUT_CLANG_IS_CC -Do not install links to the Clang C/C++ compiler as -.Pa /usr/bin/cc , -.Pa /usr/bin/c++ -and -.Pa /usr/bin/cpp . .It Va WITHOUT_CLEAN Do not clean before building world and/or kernel. .It Va WITHOUT_CPP diff --git a/share/mk/src.opts.mk b/share/mk/src.opts.mk index 5089a034350d..adb6912daa7d 100644 --- a/share/mk/src.opts.mk +++ b/share/mk/src.opts.mk @@ -81,7 +81,6 @@ __DEFAULT_YES_OPTIONS = \ CDDL \ CLANG \ CLANG_BOOTSTRAP \ - CLANG_IS_CC \ CLEAN \ CPP \ CROSS_COMPILER \ diff --git a/tools/build/options/WITHOUT_CLANG_IS_CC b/tools/build/options/WITHOUT_CLANG_IS_CC deleted file mode 100644 index 85d80ad476a5..000000000000 --- a/tools/build/options/WITHOUT_CLANG_IS_CC +++ /dev/null @@ -1,6 +0,0 @@ -.\" $FreeBSD$ -Do not install links to the Clang C/C++ compiler as -.Pa /usr/bin/cc , -.Pa /usr/bin/c++ -and -.Pa /usr/bin/cpp . diff --git a/tools/build/options/WITH_CLANG_IS_CC b/tools/build/options/WITH_CLANG_IS_CC deleted file mode 100644 index 9ab78c569dd2..000000000000 --- a/tools/build/options/WITH_CLANG_IS_CC +++ /dev/null @@ -1,6 +0,0 @@ -.\" $FreeBSD$ -Install links to the Clang C/C++ compiler as -.Pa /usr/bin/cc , -.Pa /usr/bin/c++ -and -.Pa /usr/bin/cpp . diff --git a/usr.bin/clang/clang/Makefile b/usr.bin/clang/clang/Makefile index 31f092608583..b3f1ff965634 100644 --- a/usr.bin/clang/clang/Makefile +++ b/usr.bin/clang/clang/Makefile @@ -19,7 +19,7 @@ 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 @@ -30,7 +30,6 @@ MLINKS+= clang.1 cc.1 \ clang.1 c++.1 \ clang.1 CC.1 \ clang.1 cpp.1 -.endif LIBADD+= z