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

Utilize cfg(bootstrap) over cfg(stage0) #61494

Merged
merged 1 commit into from
Jun 6, 2019

Conversation

Mark-Simulacrum
Copy link
Member

Also removes stage1, stage2 cfgs being passed to rustc to ensure that
stage1 and stage2 are only differentiated as a group (i.e., only through
not bootstrap).

Fixes #53582

r? @alexcrichton

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Jun 3, 2019
@alexcrichton
Copy link
Member

@bors: r+

@bors
Copy link
Contributor

bors commented Jun 3, 2019

📌 Commit d04d56d has been approved by alexcrichton

@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 Jun 3, 2019
Centril added a commit to Centril/rust that referenced this pull request Jun 4, 2019
…ap, r=alexcrichton

Utilize cfg(bootstrap) over cfg(stage0)

Also removes stage1, stage2 cfgs being passed to rustc to ensure that
stage1 and stage2 are only differentiated as a group (i.e., only through
not bootstrap).

Fixes rust-lang#53582

r? @alexcrichton
@Centril
Copy link
Contributor

Centril commented Jun 4, 2019

Failed in #61509 (comment), @bors r-

@bors bors added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Jun 4, 2019
Also removes stage1, stage2 cfgs being passed to rustc to ensure that
stage1 and stage2 are only differentiated as a group (i.e., only through
not bootstrap).
@Mark-Simulacrum
Copy link
Member Author

This PR probably shouldn't be rolled up as anything that adds cfg(stage0) or cfg(not(stage0)) will silently merge-conflict with it.

@bors r=alexcrichton

@bors
Copy link
Contributor

bors commented Jun 5, 2019

📌 Commit bea2e55 has been approved by alexcrichton

@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-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Jun 5, 2019
@Centril
Copy link
Contributor

Centril commented Jun 6, 2019

@Mark-Simulacrum Please use rollup=never in that case.

@bors rollup=never

@bors
Copy link
Contributor

bors commented Jun 6, 2019

⌛ Testing commit bea2e55 with merge 51dc52b...

bors added a commit that referenced this pull request Jun 6, 2019
…richton

Utilize cfg(bootstrap) over cfg(stage0)

Also removes stage1, stage2 cfgs being passed to rustc to ensure that
stage1 and stage2 are only differentiated as a group (i.e., only through
not bootstrap).

Fixes #53582

r? @alexcrichton
@bors
Copy link
Contributor

bors commented Jun 6, 2019

☀️ Test successful - checks-travis, status-appveyor
Approved by: alexcrichton
Pushing 51dc52b to master...

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
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.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Stop passing stage1/stage2 to compiler build
5 participants