From e5ccad508ba818198f29777de71a0cb78786d60d Mon Sep 17 00:00:00 2001 From: Alex Richardson Date: Mon, 12 Oct 2020 10:42:28 +0000 Subject: [PATCH] Fix build with -DBOOTSTRAP_ALL_TOOLS sbin/sysctl can no longer be bootstrapped on FreeBSD 12 after r366465, so create a symlink to the host tool instead of trying to build it. --- Makefile.inc1 | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/Makefile.inc1 b/Makefile.inc1 index c4a956d2abd6..fbeb0d23d12e 100644 --- a/Makefile.inc1 +++ b/Makefile.inc1 @@ -2330,7 +2330,10 @@ _basic_bootstrap_tools+=usr.bin/ldd .endif # sysctl/chflags are required for installkernel: .if !defined(CROSSBUILD_HOST) -_basic_bootstrap_tools+=sbin/sysctl bin/chflags +_basic_bootstrap_tools+=bin/chflags +# Note: sysctl does not bootstrap on FreeBSD < 13 anymore, but that doesn't +# matter since we don't need any of the new features for the build. +_bootstrap_tools_links+=sysctl .else # When building on non-FreeBSD, install a fake chflags instead since the # version from the source tree cannot work. We also don't need sysctl since we