Add "objects" support to Rust targets #14031
Open
Conversation
This file contains 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
os.path.abspath of the target subdir is not guaranteed to give a sensible
answer; depending on what directory you run meson from, it could build
an absolute path relative the source directory or the build directory
or possibly neither one. In fact, using os.path.abspath is quite rare
in Meson's code and generally only done in code like
subdir = os.path.abspath(os.path.join(self.sourcedir, target['subdir']))
or
ndir1 = os.path.abspath(os.path.realpath(dir1))
While at it, don't use getattr unnecessarily, the cratetype is available.
Reviewed-by: Dylan Baker <dylan@pnwbakers.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Reviewed-by: Dylan Baker <dylan@pnwbakers.com> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Implement RustCompiler.build_rpath_args, so that more code can be shared between non-Rust and Rust targets. Then, RustCompiler can override it to convert the arguments to "-C link-arg=" and add the rustup sysroot. Reviewed-by: Dylan Baker <dylan@pnwbakers.com> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Since the introduction of dep-info=... it is possible to move the depfile away from the main build directory without using --out-dir. This is less surprising, since the rules for mixing --emit, --out-dir and -o are not really documented. Reviewed-by: Dylan Baker <dylan@pnwbakers.com> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Add functions to RustCompiler() to account for differences between rustc and "rustdoc --test": rustdoc always generates a binary, does not support -g, and does not need --emit. Reviewed-by: Dylan Baker <dylan@pnwbakers.com> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Since we're going to split generate_rust_target() in multiple functions, eliminate the only variable that spans large parts of it. The cratetype ninja variable has been unused since Meson started invoking rustc directly nine years ago (commit d952812, "Fix Rust to work with 1.3 release. Closes mesonbuild#277.", 2015-10-11). Reviewed-by: Dylan Baker <dylan@pnwbakers.com> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Allow reusing the code for doctests. In particular, the sources are shared between the two cases. Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
All Fortran-specific handling of "objects:" is for now in generate_target(); parts of it can be reused for Rust. Even though Rust is only supported by the ninja backend, move the Fortran handling entirely outside ninjabackend.py: it's not specific to Ninja, it can be implemented easily using inheritance, and it also gets better typing this way. Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
![github-advanced-security[bot]](https://avatars.githubusercontent.com/in/57789?s=60&v=4){kind=small}
| @@ -27,7 +27,7 @@ | |||
|
|
|||
| if T.TYPE_CHECKING: | |||
| from .. import coredata | |||
| from ..build import BuildTarget, DFeatures | |||
| from ..build import BuildTarget, BuildTargetTypes, DFeatures | |||
Check failure
Code scanning / CodeQL
Module-level cyclic import Error
| @@ -27,7 +27,7 @@ | |||
|
|
|||
| if T.TYPE_CHECKING: | |||
| from .. import coredata | |||
| from ..build import BuildTarget, DFeatures | |||
| from ..build import BuildTarget, BuildTargetTypes, DFeatures | |||
Check failure
Code scanning / CodeQL
Module-level cyclic import Error
| @@ -27,7 +27,7 @@ | |||
|
|
|||
| if T.TYPE_CHECKING: | |||
| from .. import coredata | |||
| from ..build import BuildTarget, DFeatures | |||
| from ..build import BuildTarget, BuildTargetTypes, DFeatures | |||
Check failure
Code scanning / CodeQL
Module-level cyclic import Error
| @@ -27,6 +28,7 @@ | |||
| ) | |||
|
|
|||
| if T.TYPE_CHECKING: | |||
| from ..build import BuildTarget, BuildTargetTypes | |||
Check failure
Code scanning / CodeQL
Module-level cyclic import Error
| @@ -27,6 +28,7 @@ | |||
| ) | |||
|
|
|||
| if T.TYPE_CHECKING: | |||
| from ..build import BuildTarget, BuildTargetTypes | |||
Check failure
Code scanning / CodeQL
Module-level cyclic import Error
bonzini
changed the title
Because rustc does not support extract_objects, QEMU creates a static library with all the C objects. It then passes this static library as link_whole, together with another static library containing general purpose utility functions which is passed as link_with. However, this is brittle because the two have a circular dependency and they cannot be merged because of the link_whole/link_with difference. While lld seems to have the --start-group/--end-group semantics automatically, ld.bfd can fail if these options are needed. This can cause difference between distros depending on how Rust is packaged (e.g. Ubuntu 22.04 and Debian bookworm seem to use ld.bfd). The simplest solution is for Meson to implement "objects:" properly for Rust. Then QEMU can use the same internal dependency objects that it already has in place for C programs. Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
bonzini
force-pushed
the
rust-objects-kwarg
branch
from
8f3f485 to
20dcac3
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Because rustc does not support extract_objects, QEMU creates a static library
with all the C objects. It then passes this static library as link_whole,
together with another static library containing general purpose utility
functions which is passed as link_with.
However, this is brittle because the two have a circular dependency and
they cannot be merged because of the link_whole/link_with difference.
While lld seems to have the --start-group/--end-group semantics
automatically, ld.bfd can fail if these options are needed. This can
cause difference between distros depending on how Rust is packaged
(e.g. Ubuntu 22.04 and Debian bookworm seem to use ld.bfd).
The simplest solution is for Meson to implement "objects:" properly
for Rust. Then QEMU can use the same internal dependency objects that it
already has in place for C programs.
To limit conflicts, this PR includes part of #13933.