git: ded58efff1e2 - stable/15 - Makefile.inc1: Make bootstrap mandoc's bootstrap libz dependency conditional
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Thu, 05 Nov 2026 00:34:18 UTC
The branch stable/15 has been updated by jrtc27:
URL: https://cgit.FreeBSD.org/src/commit/?id=ded58efff1e21e53a3ccae1a01373daa2c523618
commit ded58efff1e21e53a3ccae1a01373daa2c523618
Author: Jessica Clarke <jrtc27@FreeBSD.org>
AuthorDate: 2026-10-29 12:29:54 +0000
Commit: Jessica Clarke <jrtc27@FreeBSD.org>
CommitDate: 2026-11-05 00:33:26 +0000
Makefile.inc1: Make bootstrap mandoc's bootstrap libz dependency conditional
We bootstrap libz unconditionally on macOS and Linux, and conditionally
on FreeBSD if pre-1600029 or DISK_IMAGE_TOOLS_BOOTSTRAP is enabled, but
if building on new enough -CURRENT without DISK_IMAGE_TOOLS_BOOTSTRAP
then libz is not bootstrapped and so this libz dependency does not
exist. Add the dependency whenever we are bootstrapping libz but not
otherwise, and do so without duplicating the condition.
Fixes: 1dbcc7ee92c4 ("Makefile.inc1: Make sure mandoc bootstrap tool depends on libz")
MFC after: 1 week
(cherry picked from commit 983cb64c05fabe2b83338d4c2087a9114ed27a1c)
---
Makefile.inc1 | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/Makefile.inc1 b/Makefile.inc1
index e2e0f3f75ab1..659be7d7e839 100644
--- a/Makefile.inc1
+++ b/Makefile.inc1
@@ -2767,7 +2767,7 @@ ${_bt}-${_tool}: ${_bt}-usr.bin/yacc ${_bt_lex_depend}
.endfor
.endif
-${_bt}-usr.bin/mandoc: ${_bt}-lib/libopenbsd ${_bt}-lib/libz
+${_bt}-usr.bin/mandoc: ${_bt}-lib/libopenbsd
# The tools listed in _basic_bootstrap_tools will generally not be
# bootstrapped unless BOOTSTRAP_ALL_TOOL is set. However, when building on a
@@ -2967,6 +2967,11 @@ ${_bt}-usr.bin/sort: ${_bt}-lib/libmd
${_bt}-usr.bin/xinstall: ${_bt}-lib/libmd
${_bt}-sbin/md5: ${_bt}-lib/libmd
.endif
+.if target(${_bt}-lib/libz)
+# If we are bootstrapping libz (e.g. when building on macOS/Linux) add the
+# necessary dependency:
+${_bt}-usr.bin/mandoc: ${_bt}-lib/libz
+.endif
#