Allow subprojects to be built for both the build and host machine (1st part) #15395
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
bonzini
force-pushed
the
subproject-per-machine-start
branch
from
da358d9 to
76c9b04
Compare
dnicolodi
reviewed
Dec 16, 2025
bonzini
force-pushed
the
subproject-per-machine-start
branch
2 times, most recently
from
a73ab26 to
b8105df
Compare
Which maps subproject name to version
Because it can be None, it is not possible to use PerMachineDefaultable.
Which de-duplicates a lot of printing material and makes it easier to change things.
bonzini
force-pushed
the
subproject-per-machine-start
branch
2 times, most recently
from
1d04d09 to
a562d65
Compare
Store it at construction time instead of extracting it from kwargs repeatedly. Extracted from a patch by Dylan Baker <dylan@pnwbakers.com> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Forcing the executor to the build machine doesn't actually work correctly once we allow build subprojects, but it also uses the wrong cmake_prefix_path.
Do not bother fully creating a new Build, since the environment will be overwritten anyway. Prefer setattr to __dict__ assignment. Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Recursively copy the value if it is a collection; this ensures that values are not overwritten until merge() is called. Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
stdlibs is a similar kind of cache to depenency_overrides, share it between build and host when not cross compiling. Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Do not rummage into build.projects_args. Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
All callers pass the subproject and machine of a target, move that to the callee. Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
This makes things easier to understand, with the project_args and project_link_args having the same structure as Build.global_args and Build.global_link_args. The difference is that the new member always includes an entry for the root project, so adjust those cases that need to look at subprojects only. Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
bonzini
force-pushed
the
subproject-per-machine-start
branch
from
a562d65 to
b34dad8
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Some patches rebased, extracted and reorganized somewhat from #12258.
These include the unrelated logic changes that are needed, or make it easier, when adding build-machine subprojects