Date: Fri, 8 Nov 2024 01:03:13 +0000 From: Jessica Clarke <jrtc27@freebsd.org> To: Warner Losh <imp@FreeBSD.org> Cc: "src-committers@freebsd.org" <src-committers@FreeBSD.org>, "dev-commits-src-all@freebsd.org" <dev-commits-src-all@FreeBSD.org>, "dev-commits-src-main@freebsd.org" <dev-commits-src-main@FreeBSD.org> Subject: Re: git: d2434697bc9c - main - loader.kboot: Build on amd64 Message-ID: <5B288C0C-5A9A-4772-8B14-06BDCC527B04@freebsd.org> In-Reply-To: <202411080059.4A80xv9q000454@gitrepo.freebsd.org> References: <202411080059.4A80xv9q000454@gitrepo.freebsd.org>
next in thread | previous in thread | raw e-mail | index | archive | help
On 8 Nov 2024, at 00:59, Warner Losh <imp@FreeBSD.org> wrote: >=20 > The branch main has been updated by imp: >=20 > URL: = https://cgit.FreeBSD.org/src/commit/?id=3Dd2434697bc9cc2d36da0f356cc5942b3= 3df87896 >=20 > 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 >=20 > loader.kboot: Build on amd64 >=20 > But comment out FDT stuff for amd64 built inside kboot. This also > restricts a bit the powerpc platforms we build on to powerpc64. >=20 > Sponsored by: Netflix > --- > stand/Makefile | 2 +- > stand/kboot/kboot/Makefile | 5 ++++- > stand/kboot/kboot/main.c | 5 ++++- > 3 files changed, 9 insertions(+), 3 deletions(-) >=20 > diff --git a/stand/Makefile b/stand/Makefile > index ce91802d4a8b..5d81e5f8a032 100644 > --- a/stand/Makefile > +++ b/stand/Makefile > @@ -37,7 +37,7 @@ INTERP_DEPENDS+=3D lua > .include <bsd.arch.inc.mk> >=20 > S.${MK_EFI}+=3D efi > -.if ${MK_FDT} !=3D "no" > +.if ${MACHINE_ARCH} =3D=3D "amd64" || ${MACHINE_ARCH} =3D=3D = "aarch64" || ${MACHINE_ARCH} =3D=3D "powerpc64" > S.${MK_LOADER_KBOOT}+=3D kboot > .endif Hm, is the outer if really needed? We already have: # KBOOT is only for powerpc64 (powerpc64le broken) amd64 and aarch64 .if ${__T} !=3D "powerpc64" && ${__T} !=3D "amd64" && ${__T} !=3D = =E2=80=9Caarch64" BROKEN_OPTIONS+=3DLOADER_KBOOT .endif in src.opts.mk, which is generally where these kinds of restrictions should live. Jess
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?5B288C0C-5A9A-4772-8B14-06BDCC527B04>