rust: allow linking with dynamic libstd #14224
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
bonzini
force-pushed
the
rust-dynamic-std
branch
3 times, most recently
from
df1552f to
daf6d4a
Compare
bonzini
force-pushed
the
rust-dynamic-std
branch
2 times, most recently
from
8f12ae2 to
273198e
Compare
bonzini
force-pushed
the
rust-dynamic-std
branch
from
273198e to
4e48662
Compare
lf-
reviewed
Feb 23, 2025
Comment on lines
+2124
to
+2127
| # -Z staticlib-prefer-dynamic) are not yet stable; alternatively, | ||
| # one could use "--emit obj" (implemented in the pull request at | ||
| # https://github.com/mesonbuild/meson/pull/11213) or "--emit rlib" | ||
| # (officially not recommended for linking with C programs). |
This comment was marked as resolved.
This comment was marked as resolved.
Sorry, something went wrong.
lf-
reviewed
Feb 23, 2025
Comment on lines
212
to
+214
| for arg in args: | ||
| rustc_rpath_args.append('-C') | ||
| rustc_rpath_args.append(f'link-arg={arg}:{self.get_target_libdir()}') | ||
| rustc_rpath_args.append('link-arg=' + arg) |
There was a problem hiding this comment.
quasi related, btw: meson currently doesn't have a unified way to specifically pass link args for rust, only these ad-hoc spots #13537
Allow adding extra directories to the rpath. Rust needs this when Rustup is in use. Signed-off-by: Paolo Bonzini <[email protected]>
RustCompiler.build_rpath_args works by appending the directory to the arguments computed by self.linker.build_rpath_args. This does not work if there is no argument to begin with, which happens for example in program crates. Use the new extra_paths argument to force inclusion of the libdir into the rpath of the binary, even in that case. Signed-off-by: Paolo Bonzini <[email protected]>
As an initial implementation, simply adding "-C prefer-dynamic" works for binary crates (as well as dylib and proc-macro that already used it). In the future this could be extended to other crate types. For more information see the comment in the changed file, as well as mesonbuild#8828 and mesonbuild#14215. Signed-off-by: Paolo Bonzini <[email protected]>
bonzini
force-pushed
the
rust-dynamic-std
branch
from
4e48662 to
6365f28
Compare
lf-
approved these changes
Feb 26, 2025
| # add prefer-dynamic if any of the Rust libraries we link | ||
| # against are dynamic or this is a dynamic library itself, | ||
| # otherwise we'll end up with multiple implementations of libstd. | ||
| args += ['-C', 'prefer-dynamic'] | ||
|
|
||
| if isinstance(target, build.SharedLibrary) or has_shared_deps: | ||
| if isinstance(target, build.SharedLibrary) or has_shared_deps \ |
There was a problem hiding this comment.
that's kinda confusing that it's just checking if the target is a rust shared lib at all (isinstance(target, build.SharedLibrary): seems like it would add rustc to RPATH for cdylibs without rust_dynamic_std specified? idk though!
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.
As a first step towards fixing #8828, allow linking Rust bin crates with dynamic libstd.
staticlib crates cannot yet do this, but this can be extended later on; in the meanwhile, this PR creates the API with a minimal implementation.