Re: git: d2434697bc9c - main - loader.kboot: Build on amd64

On 11/7/24 19:03, Jessica Clarke wrote:
> On 8 Nov 2024, at 00:59, Warner Losh <imp@FreeBSD.org> wrote:
>>
>> The branch main has been updated by imp:
>>
>> URL: https://cgit.FreeBSD.org/src/commit/?id=d2434697bc9cc2d36da0f356cc5942b33df87896
>>
>> commit d2434697bc9cc2d36da0f356cc5942b33df87896
>> Author:     Warner Losh <imp@FreeBSD.org>
>> AuthorDate: 2024-11-07 22:59:04 +0000
>> Commit:     Warner Losh <imp@FreeBSD.org>
>> CommitDate: 2024-11-07 23:23:26 +0000
>>
>>     loader.kboot:  Build on amd64
>>
>>     But comment out FDT stuff for amd64 built inside kboot. This also
>>     restricts a bit the powerpc platforms we build on to powerpc64.
>>
>>     Sponsored by:           Netflix
>> ---
>> stand/Makefile             | 2 +-
>> stand/kboot/kboot/Makefile | 5 ++++-
>> stand/kboot/kboot/main.c   | 5 ++++-
>> 3 files changed, 9 insertions(+), 3 deletions(-)
>>
>> diff --git a/stand/Makefile b/stand/Makefile
>> index ce91802d4a8b..5d81e5f8a032 100644
>> --- a/stand/Makefile
>> +++ b/stand/Makefile
>> @@ -37,7 +37,7 @@ INTERP_DEPENDS+= lua
>> .include <bsd.arch.inc.mk>
>>
>> S.${MK_EFI}+= efi
>> -.if ${MK_FDT} != "no"
>> +.if ${MACHINE_ARCH} == "amd64" || ${MACHINE_ARCH} == "aarch64" || ${MACHINE_ARCH} == "powerpc64"
>> S.${MK_LOADER_KBOOT}+= kboot
>> .endif
> 
> Hm, is the outer if really needed? We already have:
> 
>    # KBOOT is only for powerpc64 (powerpc64le broken) amd64 and aarch64
>    .if ${__T} != "powerpc64" && ${__T} != "amd64" && ${__T} != “aarch64"
>    BROKEN_OPTIONS+=LOADER_KBOOT
>    .endif
> 
> in src.opts.mk, which is generally where these kinds of restrictions
> should live.
> 

I had the same thought about the BHYVE option the other day... it'd be 
useful if we BROKEN_OPTION'd it so that MK_BHYVE is accurate on 
platforms that don't support it.  The particular context where it 
would've been nice is depend-cleanup.sh, since we could've used it as a 
heuristic to nuke the errant include dirs if the option was properly 
disabled.

Thanks,

Kyle Evans