Page MenuHomeFreeBSD

tools/build/make.py: Keep bootstrapped bmake binary up-to-date
ClosedPublic

Authored by jrtc27 on Aug 22 2023, 5:56 PM.
Tags
None
Referenced Files
F103070587: D41556.diff
Wed, Nov 20, 1:20 PM
F102994831: D41556.id126428.diff
Tue, Nov 19, 2:50 PM
Unknown Object (File)
Tue, Nov 19, 2:12 AM
Unknown Object (File)
Tue, Nov 19, 12:48 AM
Unknown Object (File)
Tue, Nov 19, 12:18 AM
Unknown Object (File)
Mon, Nov 18, 6:54 PM
Unknown Object (File)
Sat, Nov 16, 9:18 AM
Unknown Object (File)
Sat, Nov 16, 6:39 AM
Subscribers

Details

Summary

We currently assume that any existing bootstrapped bmake binary will
work, but this means it never gets updated as contrib/bmake is, and
similarly we won't rebuild it as and when the configure arguments given
to boot-strap change. Whilst the former isn't necessarily a huge problem
given WANT_MAKE_VERSION rarely gets bumped in Makefile, having fewer
variables is a good thing, and so it's easiest if we just always keep it
up-to-date rather than trying to do something similar to what's already
in Makefile (which may or may not be accurate, given updating FreeBSD
gives you an updated bmake, but nothing does so for our bootstrapped
bmake on non-FreeBSD). The latter is more problematic, though, and the
next commit will be changing this configuration.

We thus now add in two checks. The first is to compare MAKE_VERSION
against _MAKE_VERSION from contrib/bmake/VERSION. The second is to
record at bootstrap time the exact configuration used, and compare that
against what we would bootstrap with.

Diff Detail

Repository
rG FreeBSD src repository
Lint
Lint Skipped
Unit
No Test Coverage
Build Status
Buildable 53243
Build 50134: arc lint + arc unit

Event Timeline

sjg added inline comments.
tools/build/make.py
96

Add -r and you don't need to worry about what sys.mk might do

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

Use -r rather tha MK_AUTO_OBJ=no

This revision now requires review to proceed.Aug 22 2023, 11:26 PM
This revision is now accepted and ready to land.Aug 23 2023, 12:20 AM