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

rustbuild: fix dist-analysis with full bootstrap disabled #38765

Merged
merged 1 commit into from
Jan 1, 2017

Conversation

xen0n
Copy link
Contributor

@xen0n xen0n commented Jan 1, 2017

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

@alexcrichton
Copy link
Member

@bors: r+ p=1

Thanks!

@bors
Copy link
Contributor

bors commented Jan 1, 2017

📌 Commit 24c7340 has been approved by alexcrichton

@bors
Copy link
Contributor

bors commented Jan 1, 2017

⌛ Testing commit 24c7340 with merge 917e5ba...

bors added a commit that referenced this pull request Jan 1, 2017
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
@bors
Copy link
Contributor

bors commented Jan 1, 2017

☀️ Test successful - status-appveyor, status-travis
Approved by: alexcrichton
Pushing 917e5ba to master...

@bors bors merged commit 24c7340 into rust-lang:master Jan 1, 2017
@xen0n xen0n deleted the i-dont-like-red-bots-2 branch January 2, 2017 04:32
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.

rustbuild: save-analysis inadvertently nuked
3 participants