Skip to content

Revert putting stage number in --version #26863

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

Merged
merged 2 commits into from
Jul 8, 2015

Conversation

brson
Copy link
Contributor

@brson brson commented Jul 7, 2015

This reverts #26599, which puts the stage number in the output of --version -v, but is not supposed to put it in the 'stage2' compiler, which is what most people refer to the binary we deploy.

The picture is not so clear though because of how stage 'promotions' happen in the build and also because the windows build deploys stage3, not stage2.

cc @richo

@rust-highfive
Copy link
Contributor

r? @pcwalton

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

@brson
Copy link
Contributor Author

brson commented Jul 7, 2015

r? @alexcrichton

@brson
Copy link
Contributor Author

brson commented Jul 7, 2015

Oh, the effect of the reverted patches is that on Linux nightlies, the compiler reports stage: stage1, when it is expected to report nothing. Off hand I'm not sure the best way to fix this in a way that works everywhere.

@richo
Copy link
Contributor

richo commented Jul 7, 2015

Yeah, sorry about the confusion here (I realised that something was amiss in this comment: #26599 (comment))

it's extremely unclear what's happening, when I forced a stage3 build, it reports nothing, however my stage2 reports stage: stage1. Looking at what make appeared to do when creating the stage3 however it appeared to only actually build a new rustc binary and copy all the libs over to the new stage, which is confusing when this code appears in rustc_driver.

Apologies for the confusion, I'll try to work out what went sideways this week.

@alexcrichton
Copy link
Member

@bors: r+ 147da94

@bors
Copy link
Collaborator

bors commented Jul 8, 2015

⌛ Testing commit 147da94 with merge 50df2a0...

bors added a commit that referenced this pull request Jul 8, 2015
This reverts #26599, which puts the stage number in the output of `--version -v`, but is not supposed to put it in the 'stage2' compiler, which is what most people refer to the binary we deploy.

The picture is not so clear though because of how stage 'promotions' happen in the build and also because the windows build deploys stage3, not stage2.

cc @richo
@bors bors merged commit 147da94 into rust-lang:master Jul 8, 2015
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants