only error combining +whole-archive and +bundle for rlibs #110917
Merged
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
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.
|
Thanks for the pull request, and welcome! The Rust team is excited to review your changes, and you should hear from @WaffleLapkin (or someone else) soon. Please see the contribution instructions for more information. Namely, in order to ensure the minimum review times lag, PR authors and assigned reviewers should ensure that the review label (
|
rustbot
added
S-waiting-on-review
|
@bors r+ rollup |
bors
added
S-waiting-on-bors
|
Beta- and stable-nominating this, it's a fix for a regression from #105601. |
petrochenkov
added
beta-nominated
|
⌛ Testing commit 6a89e94 with merge 69856a508f67741f6cfd7b12ebdf5e6b56538d98... |
|
💔 Test failed - checks-actions |
bors
added
S-waiting-on-review
|
@bors retry python setuptools issue |
bors
added
S-waiting-on-bors
matthiaskrgr
added a commit
to matthiaskrgr/rust
that referenced
this pull request
Apr 28, 2023
…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`
This was referenced Apr 28, 2023
bors
added a commit
to rust-lang-ci/rust
that referenced
this pull request
Apr 28, 2023
…iaskrgr Rollup of 8 pull requests Successful merges: - rust-lang#110877 (Provide better type hints when a type doesn't support a binary operator) - rust-lang#110917 (only error combining +whole-archive and +bundle for rlibs) - rust-lang#110921 (Use `NonNull::new_unchecked` and `NonNull::len` in `rustc_arena`.) - rust-lang#110927 (Encoder/decoder cleanups) - rust-lang#110944 (share BinOp::Offset between CTFE and Miri) - rust-lang#110948 (run-make test: using single quotes to not trigger the shell) - rust-lang#110957 (Fix an ICE in conflict error diagnostics) - rust-lang#110960 (fix false negative for `unused_mut`) Failed merges: r? `@ghost` `@rustbot` modify labels: rollup
rustbot added this to the 1.71 milestone. Are you suggesting to cherry pick this to 1.70? How does that process work? |
|
@Be-ing |
rustbot
added
beta-accepted
Mark-Simulacrum
removed
the
beta-nominated
Merged
bors
added a commit
to rust-lang-ci/rust
that referenced
this pull request
May 7, 2023
…k-Simulacrum [beta] backport This PR backports: - rust-lang#111015: Remove wrong assertion in match checking. - rust-lang#110917: only error combining +whole-archive and +bundle for rlibs - rust-lang#111201: bootstrap: add .gitmodules to the sources r? `@Mark-Simulacrum`
Mark-Simulacrum
removed
the
stable-nominated
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.
Fixes #110912
Checking
flavor == RlibFlavor::Normalwas accidentally lost in 601fc8b#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