Skip to content
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

[beta] Do not probe for -Cembed-bitcode #8206

Merged
merged 2 commits into from
May 4, 2020

Conversation

alexcrichton
Copy link
Member

This flag didn't make it to the beta branch of rustc, so remove the
probe here in Cargo. This is intended to be a very small patch to remove
the probe, since the real support is updated on master and will replace
this eventually anyway.

This flag didn't make it to the beta branch of rustc, so remove the
probe here in Cargo. This is intended to be a very small patch to remove
the probe, since the real support is updated on master and will replace
this eventually anyway.
@rust-highfive
Copy link

r? @Eh2406

(rust_highfive has picked a reviewer for you, use r? to override)

@rust-highfive
Copy link

⚠️ Warning ⚠️

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

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label May 4, 2020
@Eh2406
Copy link
Contributor

Eh2406 commented May 4, 2020

@bors r+

@bors
Copy link
Collaborator

bors commented May 4, 2020

📌 Commit 96d5b73 has been approved by Eh2406

@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 4, 2020
@alexcrichton
Copy link
Member Author

For some context this was originally added (Apr 3) in #8066 to accompany rust-lang/rust#70458. Unfortuantely the rust-lang/rust PR did not land due to test issues, but it took quite some time for FCP to pass (closed Apr 19).

We then renamed the option in #8134 (Apr 19) to accompany a new rustc change at rust-lang/rust#71323 which landed Apr 22. The beta cutoff was Apr 21, however, so although the Cargo changes rode the train into beta none of the rustc changes did.

The purpose of this PR is to "back out" the Cargo changes from the beta train. This isn't a straight revert to keep the patch minimal, but the impact of this is that all compilations won't start out with a failed probe to see whether rustc supports -Cbitcode-in-rlib.

Everything should be sorted out on nightly where rustc implements -Cembed-bitcode=no and we very recently renamed this back in Cargo. Once the Cargo submodule is updated on the master branch of rust-lang/rust we should be all set.

@bors
Copy link
Collaborator

bors commented May 4, 2020

⌛ Testing commit 96d5b73 with merge d97ae45...

@bors
Copy link
Collaborator

bors commented May 4, 2020

☀️ Test successful - checks-azure
Approved by: Eh2406
Pushing d97ae45 to rust-1.44.0...

@bors bors merged commit d97ae45 into rust-lang:rust-1.44.0 May 4, 2020
@ehuss ehuss added this to the 1.44.0 milestone Feb 6, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants