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

2018-08-21 Thread Alexander Richardson
In my testing 338129 fixed the issue. Seems like the problem is that bsd.crunchgen.mk iterates over all directories to do a make obj when it does the bootstrap-tools phase. On Tue, 21 Aug 2018 at 14:49, Warner Losh wrote: > > > > On Tue, Aug 21, 2018 at 12:38 AM, John Baldwin wrote: >> >> On 8/20

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

2018-08-21 Thread Alexander Richardson
I think relaxing the check to just avoid includes of "${SRCTOP}/sys" is probably the best solution. It would be nice to also handle the ${.CURDIR}/../../sys case but since it's just there to prevent ABI issues that's probably fine. Alex On Tue, 21 Aug 2018 at 15:19 Warner Losh wrote: > On Tue,

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

2018-08-21 Thread Warner Losh
On Tue, Aug 21, 2018 at 8:16 AM, Warner Losh wrote: > There's a half a dozen special targets, however. clean comes to mind... > > > However, this test is needlessly restrictive: > > .if !empty(CFLAGS:M*${SRCTOP}/sys*:N*${SRCTOP}/sys/cddl/compat*: > N*${SRCTOP}/sys/crypto*) > > since it matches >

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

2018-08-21 Thread Warner Losh
There's a half a dozen special targets, however. clean comes to mind... However, this test is needlessly restrictive: .if !empty(CFLAGS:M*${SRCTOP}/sys*:N*${SRCTOP}/sys/cddl/compat*:N*${SRCTOP}/sys/crypto*) since it matches CFLAGS+=-I${SRCTOP}/sys/sys/disk which is totally legit. It's designe

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

2018-08-21 Thread Warner Losh
On Tue, Aug 21, 2018 at 7:49 AM, Warner Losh wrote: > > > On Tue, Aug 21, 2018 at 12:38 AM, John Baldwin wrote: > >> On 8/20/18 9:00 PM, O. Hartmann wrote: >> > -BEGIN PGP SIGNED MESSAGE- >> > Hash: SHA512 >> > >> > Am Mon, 20 Aug 2018 21:24:21 +0200 >> > "O. Hartmann" schrieb: >> > >>

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

2018-08-21 Thread Warner Losh
On Tue, Aug 21, 2018 at 12:38 AM, John Baldwin wrote: > On 8/20/18 9:00 PM, O. Hartmann wrote: > > -BEGIN PGP SIGNED MESSAGE- > > Hash: SHA512 > > > > Am Mon, 20 Aug 2018 21:24:21 +0200 > > "O. Hartmann" schrieb: > > > >> -BEGIN PGP SIGNED MESSAGE- > >> Hash: SHA512 > >> > >> Bui

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

2018-08-20 Thread John Baldwin
On 8/20/18 9:00 PM, O. Hartmann wrote: > -BEGIN PGP SIGNED MESSAGE- > Hash: SHA512 > > Am Mon, 20 Aug 2018 21:24:21 +0200 > "O. Hartmann" schrieb: > >> -BEGIN PGP SIGNED MESSAGE- >> Hash: SHA512 >> >> Building NanoBSD world on CURRENT r338113 fails due to: >> >> [...] >> cd /pool

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

2018-08-20 Thread O. Hartmann
-BEGIN PGP SIGNED MESSAGE- Hash: SHA512 Am Mon, 20 Aug 2018 21:24:21 +0200 "O. Hartmann" schrieb: > -BEGIN PGP SIGNED MESSAGE- > Hash: SHA512 > > Building NanoBSD world on CURRENT r338113 fails due to: > > [...] > cd /pool/sources/CURRENT/src/rescue/rescue/../../sbin/gbde && M

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

2018-08-20 Thread O. Hartmann
-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/CURREN