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

LLVM: Add triple for Fuchsia #37261

Merged
merged 2 commits into from
Oct 21, 2016
Merged

LLVM: Add triple for Fuchsia #37261

merged 2 commits into from
Oct 21, 2016

Conversation

raphlinus
Copy link
Contributor

@raphlinus raphlinus commented Oct 18, 2016 •
edited by bluss
Loading

Update subproject commit.

Fixes #36920

@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 @alexcrichton (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.

@alexcrichton
Copy link
Member

Looks like this update also includes rust-lang/llvm#55 which was being added over at #37125. I'll just close that though in favor of this to prevent conflicts.

@raphlinus could you also update src/rustllvm/llvm-auto-clean-trigger as well? Changing that file will cause a rebuild of LLVM on the buildbots as well.

@alexcrichton alexcrichton mentioned this pull request Oct 18, 2016
Closed
@alexcrichton
Copy link
Member

@bors: r+

@bors
Copy link
Contributor

bors commented Oct 18, 2016

📌 Commit 83f1050 has been approved by alexcrichton

@eddyb eddyb mentioned this pull request Oct 19, 2016
Merged
bors added a commit that referenced this pull request Oct 19, 2016
@bors
Auto merge of #37269 - eddyb:rollup, r=eddyb
0c42987 
Rollup of 23 pull requests

- Successful merges: #36964, #37108, #37117, #37124, #37161, #37176, #37182, #37193, #37198, #37202, #37208, #37218, #37221, #37224, #37230, #37231, #37233, #37236, #37240, #37254, #37257, #37265, #37267
- Failed merges: #37213, #37220, #37261
@bors
Copy link
Contributor

bors commented Oct 19, 2016

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

@bluss
Copy link
Member

bluss commented Oct 19, 2016

I edited the PR description to indicate an issue it fixes (so that it closes automatically).

@raphlinus
LLVM: Add triple for Fuchsia
8bb76f9 
Update subproject commit.
@raphlinus
Update llvm-auto-clean-trigger
b8697d9 
Update the datestamp so that buildbots do a clean rebuild of llvm.
@bluss
Copy link
Member

bluss commented Oct 20, 2016

@bors r+

@bors
Copy link
Contributor

bors commented Oct 20, 2016

📌 Commit b8697d9 has been approved by bluss

@bors
Copy link
Contributor

bors commented Oct 20, 2016

⌛ Testing commit b8697d9 with merge f094206...

bors added a commit that referenced this pull request Oct 20, 2016
@bors
Auto merge of #37261 - raphlinus:update_llvm, r=bluss
f094206 
LLVM: Add triple for Fuchsia

Update subproject commit.

Fixes #36920
@bors
Copy link
Contributor

bors commented Oct 21, 2016

☀️ Test successful - auto-linux-32-nopt-t, auto-linux-32-opt, auto-linux-64-cargotest, auto-linux-64-cross-freebsd, auto-linux-64-debug-opt, auto-linux-64-nopt-t, auto-linux-64-opt, auto-linux-64-opt-rustbuild, auto-linux-64-x-android-t, auto-linux-cross-opt, auto-linux-musl-64-opt, auto-mac-32-opt, auto-mac-64-opt, auto-mac-64-opt-rustbuild, auto-mac-cross-ios-opt, auto-win-gnu-32-opt, auto-win-gnu-32-opt-rustbuild, auto-win-gnu-64-opt, auto-win-msvc-32-opt, auto-win-msvc-64-cargotest, auto-win-msvc-64-opt, auto-win-msvc-64-opt-rustbuild
Approved by: bluss
Pushing f094206 to master...

@bors bors merged commit b8697d9 into rust-lang:master Oct 21, 2016
@raphlinus raphlinus deleted the update_llvm branch October 21, 2016 01:34
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@alexcrichton alexcrichton

Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@raphlinus @rust-highfive @alexcrichton @bors @bluss