-
Notifications
You must be signed in to change notification settings - Fork 12.8k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Enable new rlib in non stable cases #105601
Conversation
I'll review this after the holidays. |
This comment was marked as resolved.
This comment was marked as resolved.
src/test/ui/native-library-link-flags/mix-bundle-and-whole-archive.stderr
Outdated
Show resolved
Hide resolved
4e73148
to
145ffdf
Compare
Changes: branch rebased, added run-make test, minor fixes. |
|
c610299
to
95bb861
Compare
95bb861
to
4098db6
Compare
r=me after addressing #105601 (comment) and squashing commits. |
4098db6
to
f45b31a
Compare
@bors r+ |
📌 Commit f45b31a38332b6a7eaa20061c514351daf381a2f has been approved by It is now in the queue for this repository. |
⌛ Testing commit f45b31a38332b6a7eaa20061c514351daf381a2f with merge 04b5f1051585446a9b8ca6d7ff5c8fa3e9f960d5... |
@bors r+ |
…e, r=petrochenkov Enable new rlib in non stable cases If bundled static library uses cfg (unstable) or whole-archive (wasn't supported) bundled libs are packed even without packed_bundled_libs. r? `@petrochenkov`
☀️ Test successful - checks-actions |
1 similar comment
☀️ Test successful - checks-actions |
Finished benchmarking commit (51cb561): comparison URL. Overall result: ❌ regressions - no action needed@rustbot label: -perf-regression Instruction countThis is a highly reliable metric that was used to determine the overall result at the top of this comment.
Max RSS (memory usage)This benchmark run did not return any relevant results for this metric. CyclesThis benchmark run did not return any relevant results for this metric. |
…l, r=petrochenkov note issue for feature(packed_bundled_libs) Add to feature (introduced in rust-lang#105601) gate description number of issue created for it. r? `@petrochenkov`
Fixes rust-lang#110912 Checking `flavor == RlibFlavor::Normal` was accidentally lost in 601fc8b rust-lang#105601 That caused combining +whole-archive and +bundle link modifiers on non-rlib crates to fail with a confusing error message saying that combination is unstable for rlibs. In particular, this caused the build to fail when +whole-archive was used on staticlib crates, even though +whole-archive effectively does nothing on non-bin crates because the final linker invocation is left to an external build system.
…b_fix, r=petrochenkov only error combining +whole-archive and +bundle for rlibs Fixes rust-lang#110912 Checking `flavor == RlibFlavor::Normal` was accidentally lost in 601fc8b rust-lang#105601 That caused combining +whole-archive and +bundle link modifiers on non-rlib crates to fail with a confusing error message saying that combination is unstable for rlibs. In particular, this caused the build to fail when +whole-archive was used on staticlib crates, even though +whole-archive effectively does nothing on non-bin crates because the final linker invocation is left to an external build system. cc `@petrochenkov`
…b_fix, r=petrochenkov only error combining +whole-archive and +bundle for rlibs Fixes rust-lang#110912 Checking `flavor == RlibFlavor::Normal` was accidentally lost in 601fc8b rust-lang#105601 That caused combining +whole-archive and +bundle link modifiers on non-rlib crates to fail with a confusing error message saying that combination is unstable for rlibs. In particular, this caused the build to fail when +whole-archive was used on staticlib crates, even though +whole-archive effectively does nothing on non-bin crates because the final linker invocation is left to an external build system. cc ``@petrochenkov``
…petrochenkov only error combining +whole-archive and +bundle for rlibs Fixes rust-lang/rust#110912 Checking `flavor == RlibFlavor::Normal` was accidentally lost in 601fc8b36b1962285e371cf3c54eeb3b1b9b3a74 rust-lang/rust#105601 That caused combining +whole-archive and +bundle link modifiers on non-rlib crates to fail with a confusing error message saying that combination is unstable for rlibs. In particular, this caused the build to fail when +whole-archive was used on staticlib crates, even though +whole-archive effectively does nothing on non-bin crates because the final linker invocation is left to an external build system. cc ``@petrochenkov``
NativeLibKind::Static { bundle: None | Some(true), whole_archive: Some(true) } | ||
if flavor == RlibFlavor::Normal => | ||
{ | ||
// Don't allow mixing +bundle with +whole_archive since an rlib may contain |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
this comment was lost along with the code, and though the code was readded in #110917, the comment was not readded
Fixes rust-lang#110912 Checking `flavor == RlibFlavor::Normal` was accidentally lost in 601fc8b rust-lang#105601 That caused combining +whole-archive and +bundle link modifiers on non-rlib crates to fail with a confusing error message saying that combination is unstable for rlibs. In particular, this caused the build to fail when +whole-archive was used on staticlib crates, even though +whole-archive effectively does nothing on non-bin crates because the final linker invocation is left to an external build system.
Fixes rust-lang#110912 Checking `flavor == RlibFlavor::Normal` was accidentally lost in 601fc8b rust-lang#105601 That caused combining +whole-archive and +bundle link modifiers on non-rlib crates to fail with a confusing error message saying that combination is unstable for rlibs. In particular, this caused the build to fail when +whole-archive was used on staticlib crates, even though +whole-archive effectively does nothing on non-bin crates because the final linker invocation is left to an external build system.
If bundled static library uses cfg (unstable) or whole-archive (wasn't supported) bundled libs are packed even without packed_bundled_libs.
r? @petrochenkov