Page MenuHomeFreeBSD

Makefile.inc1: Enable requesting the universe toolchain.
ClosedPublic

Authored by jhb on Jun 27 2023, 6:57 PM.
Tags
None
Referenced Files
Unknown Object (File)
Sat, Nov 30, 5:12 PM
Unknown Object (File)
Fri, Nov 15, 6:37 PM
Unknown Object (File)
Fri, Nov 15, 5:47 PM
Unknown Object (File)
Fri, Nov 15, 3:49 PM
Unknown Object (File)
Nov 11 2024, 7:33 AM
Unknown Object (File)
Oct 22 2024, 12:59 AM
Unknown Object (File)
Oct 17 2024, 9:30 AM
Unknown Object (File)
Oct 9 2024, 8:25 PM
Subscribers

Details

Summary

make universe builds a cross toolchain uner HOST_OBJTMP/tmp via the
universe-toolchain target. However, doing a plain 'make buildworld'
after a universe/tinderbox run (e.g. to reproduce a failure and test
the fix for it), will try to build a new cross toolchain under
OBJTMP/tmp which can be tedious. This commit adds a make variable
(UNIVERSE_TOOLCHAIN) which can be used similar to CROSS_TOOLCHAIN to
request an external toolchain. If this variable is set (value doesn't
matter), the the universe toolchain is used as an external toolchain.

Diff Detail

Repository
rG FreeBSD src repository
Lint
Lint Not Applicable
Unit
Tests Not Applicable

Event Timeline

jhb requested review of this revision.Jun 27 2023, 6:57 PM

Fix it to work with sub-stages of buildworld.

Makefile.inc1
77

For some reason HOST_OBJTOP isn't the right value here, I end up with /usr/obj/usr/home/john/work/freebsd/main/amd64.amd64/tmp/obj-tools/freebsd13-amd64 instead of /usr/obj/usr/home/john/work/freebsd/main/freebsd13-amd64. I can't figure out exactly how HOST_OBJTOP is set. Hmm, I guess it's just that I need OBJROOT to be different in this case and manually use the different OBJROOT + HOST__TARGET.

This appears to be because different stages in the build use custom OBJROOTs. I have changes to explicitly pass in UNIVERSE_TOOLCHAIN_PATH to those which "fixes" it.

82

This is a debugging hack I can axe. I had hoped that this would avoid the need to not explicitly pass the variable in the various FOOARGS variables, but it did not. :(

Looks good to me...

This revision is now accepted and ready to land.Aug 1 2023, 3:11 PM