buildworld failure: Do not include ${SRCTOP}/sys when building bootstrap tools

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA512

Building NanoBSD world on CURRENT r338113 fails due to:

[...]
cd /pool/sources/CURRENT/src/rescue/rescue/../../sbin/gbde &&  MK_TESTS=no
UPDATE_DEPENDFILE=no  _RECURSING_CRUNCH=1
MAKEOBJDIRPREFIX=/pool/nanobsd/amd64/ALERICH_amd64/pool/sources/CURRENT/src/amd64.amd64/rescue/rescue
make  MK_AUTO_OBJ=no  DIRPRFX=rescue/rescue/gbde/ -DRESCUE CRUNCH_CFLAGS=-DRESCUE
MK_AUTO_OBJ=no   obj make[5]: "/pool/sources/CURRENT/src/tools/build/mk/Makefile.boot"
line 18: Do not include ${SRCTOP}/sys when building bootstrap tools.  Copy the header to
${WORLDTMP}/legacy in tools/build/Makefile instead.  Error was caused by Makefile
in /pool/sources/CURRENT/src/sbin/gbde *** [obj_crunchdir_gbde] Error code 1

make[4]: stopped in /pool/sources/CURRENT/src/rescue/rescue
[...]


This problem occured during today's source updates since I was able to build the NanoBSD
image I intend to build yesterday ~ r338060.

What is going wrong?

I've set the following for NanoBSD's build and install:

# BUILDWORLD ONLY
# Options to put in make.conf during buildworld only
CONF_BUILD='
CFLAGS=-O3 -pipe
MALLOC_PRODUCTION=YES
INSTALL_NODEBUG=YES
'
# Options to put in make.conf during installworld only
CONF_INSTALL='
WITHOUT_TOOLCHAIN=YES
WITHOUT_CROSS_COMPILER=YES
WITHOUT_DOCCOMPRESS=YES
WITHOUT_INSTALLLIB=YES
WITHOUT_BINUTILS=YES
#
#WITHOUT_ACCT=YES
WITHOUT_AMD=YES
WITHOUT_APM=YES
WITHOUT_ASSERT_DEBUG=YES
WITHOUT_AT=YES
WITHOUT_ATM=YES
WITHOUT_BHYVE=YES
WITHOUT_BLUETOOTH=YES
WITHOUT_BOOTPARAMD=YES
WITHOUT_BOOTPD=YES
WITHOUT_BSDINSTALL=YES
#WITHOUT_BSD_CPIO=YES
#WITHOUT_BSNMP=YES
#WITHOUT_BZIP2=YES
WITHOUT_CALENDAR=YES
#WITHOUT_CCD=YES
WITHOUT_CDDL=YES
WITHOUT_CLANG_FULL=YES
WITHOUT_CTM=YES
#WITHOUT_CUSE=YES
WITHOUT_CXX=YES
WITHOUT_DICT=YES
WITHOUT_DIALOG=YES
WITHOUT_EXAMPLES=YES
WITHOUT_EE=YES
WITHOUT_FINGER=YES
WITHOUT_FLOPPY=YES
WITHOUT_FREEBSD_UPDATE=YES
WITHOUT_FDT=YES
WITHOUT_GAMES=YES
WITHOUT_GCOV=YES
WITHOUT_GDB=YES
WITHOUT_HAST=YES
WITHOUT_HTML=YES
WITHOUT_HYPERV=YES
#WITHOUT_INET6=YES
#WITHOUT_INETD=YES
WITHOUT_IPFILTER=YES
WITHOUT_ISCSI=YES
WITHOUT_KDUMP=YES
WITHOUT_KERNEL_SYMBOLS=YES
#WITHOUT_LDNS=YES
WITHOUT_LOCATE=YES
WITHOUT_LPR=YES
#WITHOUT_MAIL=YES
#WITHOUT_MAILWRAPPER=YES
#WITHOUT_MAKE=YES
WITHOUT_MAN=YES
WITHOUT_MAN_UTILS=YES
WITHOUT_NDIS=YES
#WITHOUT_NETCAT=YES
#WITHOUT_NIS=YES
#WITHOUT_NLS_CATALOGS=YES
#WITHOUT_NS_CACHING=YES
WITHOUT_NAND=YES
WITHOUT_OFED=YES
WITHOUT_PC_SYSINSTALL=YES
WITHOUT_PF=YES
WITHOUT_PKGBOOTSTRAP=YES
WITHOUT_PMC=YES
WITHOUT_PORTSNAP=YES
#WITHOUT_PPP=YES
WITHOUT_QUOTAS=YES
WITHOUT_RBOOTD=YES
WITHOUT_RCMDS=YES
#WITHOUT_RESCUE=YES
#WITHOUT_ROUTED=YES
#WITHOUT_SENDMAIL=YES
WITHOUT_SHAREDOCS=YES
WITHOUT_SVNLITE=YES
WITHOUT_TALK=YES
#WITHOUT_TCSH=YES
WITHOUT_TELNET=YES
WITHOUT_TEXTPROC=YES
WITHOUT_TFTP=YES
#WITHOUT_WIRELESS=YES
WITHOUT_ZFS=YES
'

# BUILD and INSTALL!
# Options to put in make.conf during both build- & installworld.
# See man src.conf(5) for more details on WITHOUT_ tags.
CONF_WORLD='
WITH_KERNEL_RETPOLINE=YES
WITH_LLVM_TARGET_BPF=YES
WITHOUT_TESTS=YES
WITHOUT_TESTS_SUPPORT=YES
WITHOUT_ASSERT_DEBUG=YES
WITHOUT_CCD=YES
#WITHOUT_BINUTILS_BOOTSTRAP=YES
WITHOUT_DEBUG_FILES=YES
#WITHOUT_ICONV=YES
WITHOUT_ISCSI=YES
WITHOUT_LIB32=YES
#WITHOUT_LLVM_TARGET_ALL=YES
WITH_ZONEINFO_LEAPSECONDS_SUPPORT=YES
WITHOUT_SVN=YES
WITH_SORT_THREADS=YES
WITH_EXTRA_TCP_STACKS=YES
#
INSTALL_NODEBUG=YES
'



- -- 
O. Hartmann

Ich widerspreche der Nutzung oder Übermittlung meiner Daten für
Werbezwecke oder für die Markt- oder Meinungsforschung (§ 28 Abs. 4 BDSG).
-----BEGIN PGP SIGNATURE-----

iLUEARMKAB0WIQQZVZMzAtwC2T/86TrS528fyFhYlAUCW3sVgAAKCRDS528fyFhY
lL4MAgCaS8UeE6FwJIeUa5Q+9hf80DJkde+oopttIL2Jz9LcbN1CRU5JTc2jJ9Vb
vO380RVTNO4M0Ge0M0m2wDCx4xzuAf9YYdjW/xTXbh09YcTlt3l22pn1aaHYrdMk
pOYA3FUw8xi09cniyQHBOr4mvjKI07GtgLKTEINU3SuS9CmFjCzg
=vFP+
-----END PGP SIGNATURE-----