The branch main has been updated by des:
URL:
https://cgit.FreeBSD.org/src/commit/?id=6dab48b9de6c1bff61b0ce78029c1e3cba20895a
commit 6dab48b9de6c1bff61b0ce78029c1e3cba20895a
Author: Dag-Erling Smørgrav <d...@freebsd.org>
AuthorDate: 2025-08-08 15:57:31 +0000
Commit: Dag-Erling Smørgrav <d...@freebsd.org>
CommitDate: 2025-08-08 15:57:31 +0000
build: Switch CLEAN back on by default
There have been too many issues with non-META_MODE incremental builds
recently, and it is clear that most users, even developers, were not
aware that the default had been switched.
This will be revisited once more work has been done to help prevent
future breakage.
This reverts commit ba373fca78a114768244d6a8c27983da870c1169.
Reviewed by: markj, jhb
Differential Revision: https://reviews.freebsd.org/D51828
---
UPDATING | 4 ++++
share/man/man5/src.conf.5 | 6 +++---
share/mk/src.opts.mk | 2 +-
tools/build/options/WITH_CLEAN | 1 -
4 files changed, 8 insertions(+), 5 deletions(-)
diff --git a/UPDATING b/UPDATING
index c817dbfed032..161c13a55065 100644
--- a/UPDATING
+++ b/UPDATING
@@ -27,6 +27,10 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 15.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".)
+20250808:
+ The CLEAN option has been switched back from default-off to
+ default-on. This reverts the 20240729 change below.
+
20250807:
routed(8) and route6d(8) have moved to the FreeBSD-rip package.
If you use either of these, you should install the new package.
diff --git a/share/man/man5/src.conf.5 b/share/man/man5/src.conf.5
index 94e5a0cfc8b9..2e694bfe3293 100644
--- a/share/man/man5/src.conf.5
+++ b/share/man/man5/src.conf.5
@@ -1,5 +1,5 @@
.\" DO NOT EDIT-- this file is @generated by tools/build/options/makeman.
-.Dd August 4, 2025
+.Dd August 8, 2025
.Dt SRC.CONF 5
.Os
.Sh NAME
@@ -411,8 +411,8 @@ Build clang-format.
.It Va WITHOUT_CLANG_FULL
Avoid building the ARCMigrate, Rewriter and StaticAnalyzer components of
the Clang C/C++ compiler.
-.It Va WITH_CLEAN
-Clean before building world and/or kernel.
+.It Va WITHOUT_CLEAN
+Do not clean before building world and/or kernel.
.It Va WITHOUT_CPP
Do not build
.Xr cpp 1 .
diff --git a/share/mk/src.opts.mk b/share/mk/src.opts.mk
index ef43d3c939b2..6000da865332 100644
--- a/share/mk/src.opts.mk
+++ b/share/mk/src.opts.mk
@@ -80,6 +80,7 @@ __DEFAULT_YES_OPTIONS = \
CDDL \
CLANG \
CLANG_BOOTSTRAP \
+ CLEAN \
CPP \
CROSS_COMPILER \
CRYPT \
@@ -200,7 +201,6 @@ __DEFAULT_NO_OPTIONS = \
BHYVE_SNAPSHOT \
CLANG_EXTRAS \
CLANG_FORMAT \
- CLEAN \
DIALOG \
DETECT_TZ_CHANGES \
DISK_IMAGE_TOOLS_BOOTSTRAP \
diff --git a/tools/build/options/WITH_CLEAN b/tools/build/options/WITH_CLEAN
deleted file mode 100644
index d5962258bcc0..000000000000
--- a/tools/build/options/WITH_CLEAN
+++ /dev/null
@@ -1 +0,0 @@
-Clean before building world and/or kernel.
