mirror/freebsd
1
0
Fork 0
mirror of https://git.FreeBSD.org/src.git synced 2024-11-21 07:15:49 +00:00
Code Issues Releases Activity

Retire CLANG_IS_CC option

Browse Source 
A small reduction in build infrastructure complexity; when we had both
Clang and GCC in the tree it was useful to have both built, and choose
one or the other to install as /usr/bin/cc.  Now only Clang is in the
tree, and there is no point in building and installing base Clang but
not providing it as cc (and c++, cpp).

Reviewed by:	imp
Sponsored by:	The FreeBSD Foundation
Differential Revision:	https://reviews.freebsd.org/D37075
This commit is contained in:
Ed Maste 2022-09-29 14:15:39 -04:00
parent 67654ffd44
commit 20a66ab4bf
7 changed files with 6 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Makefile.inc1
View File

@ -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

4
UPDATING
View File

@ -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:

8
share/man/man5/src.conf.5
View File

@ -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

1
share/mk/src.opts.mk
View File

@ -81,7 +81,6 @@ __DEFAULT_YES_OPTIONS = \
CDDL \
CLANG \
CLANG_BOOTSTRAP \
CLANG_IS_CC \
CLEAN \
CPP \
CROSS_COMPILER \

6
tools/build/options/WITHOUT_CLANG_IS_CC
View File

@ -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 .

6
tools/build/options/WITH_CLANG_IS_CC
View File

@ -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 .

3
usr.bin/clang/clang/Makefile
View File

@ -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