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.

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

[beta] 1.43: don't pass -Zconfig-profile to cargo when self rebuilding #70320

Merged
merged 1 commit into from
Mar 25, 2020
Merged

[beta] 1.43: don't pass -Zconfig-profile to cargo when self rebuilding #70320

merged 1 commit into from
Mar 25, 2020

Conversation

Keruspe
Copy link
Contributor

@Keruspe Keruspe commented Mar 23, 2020

This option is now stable thus our cargo will reject it

Fixes #69975

@Keruspe
rustbuild: only pass -Zconfig-profile if we're not self bootstraping
cd935cb 
This option is now stable thus our cargo will reject it

Fixes rust-lang#69975

Signed-off-by: Marc-Antoine Perennou <Marc-Antoine@Perennou.com>
@rust-highfive
Copy link
Collaborator

r? @Mark-Simulacrum

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

@rust-highfive
Copy link
Collaborator

⚠️ 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!

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Mar 23, 2020
@Mark-Simulacrum Mark-Simulacrum added beta-accepted Accepted for backporting to the compiler in the beta channel. beta-nominated Nominated for backporting to the compiler in the beta channel. labels Mar 23, 2020
@Mark-Simulacrum
Copy link
Member

@bors r+ p=-1 rollup=never

I'll roll this into the next beta backport (likely next week), thanks!

@bors
Copy link
Contributor

bors commented Mar 23, 2020

📌 Commit cd935cb has been approved by Mark-Simulacrum

@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 Mar 23, 2020
@Mark-Simulacrum Mark-Simulacrum changed the title 1.43: don't pass -Zconfig-profile to cargo when self rebuilding [beta] 1.43: don't pass -Zconfig-profile to cargo when self rebuilding Mar 24, 2020
@bors
Copy link
Contributor

bors commented Mar 25, 2020

⌛ Testing commit cd935cb with merge 4c587bb...

@bors
Copy link
Contributor

bors commented Mar 25, 2020

☀️ Test successful - checks-azure
Approved by: Mark-Simulacrum
Pushing 4c587bb to beta...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Mar 25, 2020
@bors bors merged commit 4c587bb into rust-lang:beta Mar 25, 2020
@Centril Centril added the T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. label Mar 25, 2020
@Mark-Simulacrum Mark-Simulacrum removed the beta-nominated Nominated for backporting to the compiler in the beta channel. label Apr 3, 2020
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
beta-accepted Accepted for backporting to the compiler in the beta channel. 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-compiler Relevant to the compiler team, which will review and decide on the PR/issue.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@Keruspe @rust-highfive @Mark-Simulacrum @bors @Centril