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

rustbuild: save-analysis inadvertently nuked #38734

Closed
xen0n opened this issue Dec 31, 2016 · 2 comments · Fixed by #38765
Closed

rustbuild: save-analysis inadvertently nuked #38734

xen0n opened this issue Dec 31, 2016 · 2 comments · Fixed by #38765
Labels
T-bootstrap Relevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap)

Comments

@xen0n
Copy link
Contributor

xen0n commented Dec 31, 2016

So #38631 invalidated the assumption that the final stage is stage2, but this piece of code still thought so, so the save-analysis data is never generated. This enraged the bots.

Let's polish rustbuild with some more <3 so that we could have a fresh nightly for a nice New Year gift to everyone...
@xen0n xen0n mentioned this issue Dec 31, 2016
Merged
@xen0n
Copy link
Contributor Author

xen0n commented Dec 31, 2016

BTW the failure on the win32 beta bot (ouch!) is not related to this. It's most likely a Windows hiccup.

@sanxiyn sanxiyn added the T-bootstrap Relevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap) label Dec 31, 2016
bors added a commit that referenced this issue Jan 1, 2017
@bors
Auto merge of #38736 - xen0n:save-the-save-analysis, r=alexcrichton
07412c8 
rustbuild: save the save analysis

Fixes #38734. ~~call me the nightly firefighter~~

r? @alexcrichton
@xen0n
Copy link
Contributor Author

xen0n commented Jan 1, 2017

Ahhhh big failure of mine. I'm focusing on the generation part (the envvar) and forgot to touch the dist.rs logic too, and the bots are as red as yesterday (facepalm). Trying to hit the 2017-01-02 nightly instead...

@xen0n xen0n mentioned this issue Jan 1, 2017
Merged
bors added a commit that referenced this issue Jan 1, 2017
@bors
Auto merge of #38765 - xen0n:i-dont-like-red-bots-2, r=alexcrichton
917e5ba 
rustbuild: fix dist-analysis with full bootstrap disabled

Really fixes #38734, per discussion in #38752 which was solving the underlying problem the wrong way.

This just mirrors the [similar logic] in documentation building as suggested, that just takes the stage1 compiler artifacts instead in case of non-full-bootstrap builds. Actually copying the artifacts around seems to be unnecessary.

r? @alexcrichton

[similar logic]: https://github.com/rust-lang/rust/blob/7b659cfdbce094a790dbb246da2681a47565782a/src/bootstrap/doc.rs#L140-L144
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Assignees
No one assigned
Labels
T-bootstrap Relevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap)
Projects
None yet
Milestone
No milestone
Development

Successfully merging a pull request may close this issue.

rustbuild: fix dist-analysis with full bootstrap disabled xen0n/rust
2 participants
@sanxiyn @xen0n