Skip to content

[beta] backport #111290

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.

Sign up for GitHub

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

Jump to bottom
Merged
merged 3 commits into from
May 7, 2023
Merged

[beta] backport #111290

merged 3 commits into from
May 7, 2023

Conversation

Mark-Simulacrum
Copy link
Member

This PR backports:

r? @Mark-Simulacrum

cjgillot and others added 3 commits May 6, 2023 11:12
@cjgillot @Mark-Simulacrum
Remove wrong assertion.
7fc63a6
@Be-ing @Mark-Simulacrum
only error with +whole-archive,+bundle for rlibs
428ac2a 
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.
@krasimirgg @Mark-Simulacrum
bootstrap: add .gitmodules to the sources
c11cc10 
The bootstrap builder now expects this file to exist:
https://github.com/rust-lang/rust/blob/6f8c0557e0b73c73a8a7163a15f4a5a3feca7d5c/src/bootstrap/builder.rs#L494
@Mark-Simulacrum Mark-Simulacrum self-assigned this May 6, 2023
@rustbot
Copy link
Collaborator

rustbot commented May 6, 2023

⚠️ Warning ⚠️

  • Pull requests are usually filed against the master branch for this repo, but this one is against beta. Please double check that you specified the right target!

@rustbot rustbot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. T-bootstrap Relevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap) T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. labels May 6, 2023
@Mark-Simulacrum
Copy link
Member Author

@bors r+ rollup=never

@bors
Copy link
Collaborator

bors commented May 6, 2023

📌 Commit c11cc10 has been approved by Mark-Simulacrum

It is now in the queue for this repository.

@bors bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels May 6, 2023
@bors
Copy link
Collaborator

bors commented May 7, 2023

⌛ Testing commit c11cc10 with merge 2013813...

@bors
Copy link
Collaborator

bors commented May 7, 2023

☀️ Test successful - checks-actions
Approved by: Mark-Simulacrum
Pushing 2013813 to beta...

1 similar comment
@bors
Copy link
Collaborator

bors commented May 7, 2023

☀️ Test successful - checks-actions
Approved by: Mark-Simulacrum
Pushing 2013813 to beta...

@bors bors added merged-by-bors This PR was explicitly merged by bors. labels May 7, 2023
@bors bors merged commit 2013813 into rust-lang:beta May 7, 2023
@rustbot rustbot added this to the 1.70.0 milestone May 7, 2023
@Julian-Wollersberger
Copy link
Contributor

This beta seems to have broken clippy and rustfmt. I get the following error:

$ rustup toolchain install beta
info: syncing channel updates for 'beta-x86_64-unknown-linux-gnu'
info: latest update on 2023-05-08, rust version 1.70.0-beta.4 (2013813b6 2023-05-07)
error: some components unavailable for download for channel 'beta': 'clippy' for target 'x86_64-unknown-linux-gnu', 'rustfmt' for target 'x86_64-unknown-linux-gnu'If you don't need the components, you could try a minimal installation with:

    rustup toolchain add beta --profile minimal

cc rust-pcap/pcap#296

@Mark-Simulacrum Mark-Simulacrum deleted the beta-backport branch June 24, 2023 14:17
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@Mark-Simulacrum Mark-Simulacrum

Labels
merged-by-bors This PR was explicitly merged by bors. S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. T-bootstrap Relevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap) T-compiler Relevant to the compiler team, which will review and decide on the PR/issue.
Projects
None yet
Milestone
1.70.0
Development

Successfully merging this pull request may close these issues.
7 participants
@Mark-Simulacrum @rustbot @bors @Julian-Wollersberger @cjgillot @Be-ing @krasimirgg