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

stage info #26599

Merged
merged 2 commits into from
Jul 7, 2015
Merged

stage info #26599

merged 2 commits into from
Jul 7, 2015

Conversation

richo
Copy link
Contributor

@richo richo commented Jun 26, 2015

This will add information about the stage that a rustc was built with to the verbose version info

I have symlinks into $(HOST)/stage{0,1,2} into the rust version switcher thing I use, and occasionally need to know which stage a given rustc is.

@rust-highfive
Copy link
Collaborator

r? @Aatch

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

@alexcrichton
Copy link
Member

r? @brson

I don't have too much of an opinion on this, but I think you might!

@rust-highfive rust-highfive assigned brson and unassigned Aatch Jun 26, 2015
@brson
Copy link
Contributor

brson commented Jun 27, 2015

I understand the use case, but I feel a little uneasy about it. It's a niche feature for rustc hackers. I want to think about it a bit more and see if others comment.

@richo richo force-pushed the richo-stage-info branch from c6f3853 to ec8dd2b Compare June 27, 2015 06:04
@jroesch
Copy link
Member

jroesch commented Jun 27, 2015

@brson I am of two minds as a rustc hacker I think it is kind of useful, but I don't know really think we should leak this information to all users of the Rust compiler given its irrelevant to 99% of our users. I tend to just use the stage1 inside the tree so it is possible I don't have the best perspective.

@richo
Copy link
Contributor Author

richo commented Jun 27, 2015

How about just leaving it out for stage2+ ?

That would seem to make it transparent to end users, but make it visible if you're poking a bootstrap compiler while hacking?

@bors
Copy link
Contributor

bors commented Jun 28, 2015

☔ The latest upstream changes (presumably #26631) made this pull request unmergeable. Please resolve the merge conflicts.

@brson
Copy link
Contributor

brson commented Jul 6, 2015

@richo Ok, let's add it for stage0/1. Thanks for your patience.

@richo
Copy link
Contributor Author

richo commented Jul 6, 2015

No worries! I'll update this when I get a sec :)

@richo richo force-pushed the richo-stage-info branch 2 times, most recently from 18b7ad5 to 8ab76af Compare July 6, 2015 20:40
@richo
Copy link
Contributor Author

richo commented Jul 6, 2015

Updated! r? @brson

@richo richo force-pushed the richo-stage-info branch from 8ab76af to e66ac43 Compare July 6, 2015 20:42
@brson
Copy link
Contributor

brson commented Jul 6, 2015

@bors r+ rollup

@bors
Copy link
Contributor

bors commented Jul 6, 2015

📌 Commit e66ac43 has been approved by brson

@richo
Copy link
Contributor Author

richo commented Jul 6, 2015

I'm not really sure what's going on, but the stage2 build (including the assets installed by make install) reports stage: stage1. Is there something wonky in the build system? I've gone back and checked that rustc was definitely getting --cfg stage2.

I think this patch is still good to land, but it seems something is askew here.

steveklabnik added a commit to steveklabnik/rust that referenced this pull request Jul 6, 2015
This will add information about the stage that a rustc was built with to the verbose version info

I have symlinks into $(HOST)/stage{0,1,2} into the rust version switcher thing I use, and occasionally need to know which stage a given rustc is.
steveklabnik added a commit to steveklabnik/rust that referenced this pull request Jul 6, 2015
This will add information about the stage that a rustc was built with to the verbose version info

I have symlinks into $(HOST)/stage{0,1,2} into the rust version switcher thing I use, and occasionally need to know which stage a given rustc is.
@bors
Copy link
Contributor

bors commented Jul 6, 2015

⌛ Testing commit e66ac43 with merge 6d71ce5...

bors added a commit that referenced this pull request Jul 6, 2015
This will add information about the stage that a rustc was built with to the verbose version info

I have symlinks into $(HOST)/stage{0,1,2} into the rust version switcher thing I use, and occasionally need to know which stage a given rustc is.
steveklabnik added a commit to steveklabnik/rust that referenced this pull request Jul 7, 2015
This will add information about the stage that a rustc was built with to the verbose version info

I have symlinks into $(HOST)/stage{0,1,2} into the rust version switcher thing I use, and occasionally need to know which stage a given rustc is.
bors added a commit that referenced this pull request Jul 7, 2015
@bors bors merged commit e66ac43 into rust-lang:master Jul 7, 2015
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
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.

7 participants