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

Enable profiler on "alternate" builds #43167

Merged
merged 1 commit into from
Jul 14, 2017
Merged

Enable profiler on "alternate" builds #43167

merged 1 commit into from
Jul 14, 2017

Conversation

SimonSapin
Copy link
Contributor

This hopefully fixes #42967 and #43085.

@rust-highfive
Copy link
Collaborator

Thanks for the pull request, and welcome! The Rust team is excited to review your changes, and you should hear from @aturon (or someone else) soon.

If any changes to this PR are deemed necessary, please add them as extra commits. This ensures that the reviewer can see what has changed since they last reviewed the code. Due to the way GitHub handles out-of-date commits, this should also make it reasonably obvious what issues have or haven't been addressed. Large or tricky changes may require several passes of review and changes.

Please see the contribution instructions for more information.

@SimonSapin
Copy link
Contributor Author

Unfortunately I don’t know how to test this without builds being published on rust-lang-ci S3.

This brings "alternate" builds closer to "normal" ones on corresponding platforms. @alexcrichton, is there a reason we might not want to do this?

@SimonSapin SimonSapin mentioned this pull request Jul 11, 2017
Closed
@alexcrichton
Copy link
Member

@bors: r+

@bors
Copy link
Contributor

bors commented Jul 11, 2017

📌 Commit a148f5b has been approved by alexcrichton

@arielb1 arielb1 added the S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. label Jul 11, 2017
@Mark-Simulacrum
Copy link
Member

@bors rollup

steveklabnik added a commit to steveklabnik/rust that referenced this pull request Jul 13, 2017
@steveklabnik
Rollup merge of rust-lang#43167 - SimonSapin:alt-profiler, r=alexcric…
591d8a1 
…hton

Enable profiler on "alternate" builds

This hopefully fixes rust-lang#42967 and rust-lang#43085.
@steveklabnik steveklabnik mentioned this pull request Jul 13, 2017
Merged
bors added a commit that referenced this pull request Jul 14, 2017
@bors
Auto merge of #43216 - steveklabnik:rollup, r=steveklabnik
ab91c70 
Rollup of 7 pull requests

- Successful merges: #42926, #43125, #43157, #43167, #43187, #43203, #43204
- Failed merges:
@bors bors merged commit a148f5b into rust-lang:master Jul 14, 2017
SimonSapin added a commit to servo/servo that referenced this pull request Jul 14, 2017
@SimonSapin
Revert "Fetch "alt" rust std build when we do so for rustc"
7d68a5a 
This reverts commit 6b52330.

This is unnecessary now that rust-lang/rust#42967
is fixed by rust-lang/rust#43167.

This migth be a fix for #17604
@SimonSapin SimonSapin mentioned this pull request Jul 17, 2017
Merged
@jonas-schievink jonas-schievink mentioned this pull request Jul 23, 2017
Closed
@sophiajt sophiajt mentioned this pull request Aug 10, 2017
Open
@SimonSapin SimonSapin deleted the alt-profiler branch November 16, 2017 17:50
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@aturon aturon

Labels
S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Serde with serde_derive fails to build in "alt" compiler on OS X
7 participants
@SimonSapin @rust-highfive @alexcrichton @bors @Mark-Simulacrum @aturon @arielb1