svn commit: r366635 - head

[Alex Richardson]

Author: arichardson
Date: Mon Oct 12 10:42:28 2020
New Revision: 366635
URL: https://svnweb.freebsd.org/changeset/base/366635

Log:
  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.

Modified:
  head/Makefile.inc1

Modified: head/Makefile.inc1
==============================================================================
--- head/Makefile.inc1	Mon Oct 12 10:42:24 2020	(r366634)
+++ head/Makefile.inc1	Mon Oct 12 10:42:28 2020	(r366635)
@@ -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