Skip to content

liballoc_jemalloc: fix linking with system library#39481

Merged
bors merged 2 commits intorust-lang:masterfrom
ishitatsuyuki:master
Feb 5, 2017
Merged

liballoc_jemalloc: fix linking with system library#39481
bors merged 2 commits intorust-lang:masterfrom
ishitatsuyuki:master

Conversation

@ishitatsuyuki
Copy link
Contributor

@ishitatsuyuki ishitatsuyuki commented Feb 3, 2017

Fix #39215

@rust-highfive
Copy link
Contributor

rust-highfive commented Feb 3, 2017

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.

@bors
Copy link
Collaborator

bors commented Feb 3, 2017

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

@aturon
Copy link
Contributor

aturon commented Feb 3, 2017

r? @alexcrichton

@rust-highfive rust-highfive assigned alexcrichton and unassigned aturon Feb 3, 2017
@alexcrichton
Copy link
Member

alexcrichton commented Feb 3, 2017

@bors: r+

@bors
Copy link
Collaborator

bors commented Feb 3, 2017

📌 Commit 7de99cd has been approved by alexcrichton

frewsxcv added a commit to frewsxcv/rust that referenced this pull request Feb 5, 2017
@frewsxcv
Rollup merge of rust-lang#39481 - ishitatsuyuki:master, r=alexcrichton
3621ff4 
liballoc_jemalloc: fix linking with system library

Fix rust-lang#39215
@frewsxcv frewsxcv mentioned this pull request Feb 5, 2017
Closed
frewsxcv added a commit to frewsxcv/rust that referenced this pull request Feb 5, 2017
@frewsxcv
Rollup merge of rust-lang#39481 - ishitatsuyuki:master, r=alexcrichton
628f1a6 
liballoc_jemalloc: fix linking with system library

Fix rust-lang#39215
@frewsxcv frewsxcv mentioned this pull request Feb 5, 2017
Closed
frewsxcv added a commit to frewsxcv/rust that referenced this pull request Feb 5, 2017
@frewsxcv
Rollup merge of rust-lang#39481 - ishitatsuyuki:master, r=alexcrichton
d021a3f 
liballoc_jemalloc: fix linking with system library

Fix rust-lang#39215
@frewsxcv frewsxcv mentioned this pull request Feb 5, 2017
Merged
bors added a commit that referenced this pull request Feb 5, 2017
@bors
Auto merge of #39567 - frewsxcv:rollup, r=frewsxcv
031c116 
Rollup of 12 pull requests

- Successful merges: #39439, #39472, #39481, #39491, #39501, #39509, #39514, #39519, #39526, #39528, #39530, #39538
- Failed merges:
@bors bors merged commit 7de99cd into rust-lang:master Feb 5, 2017
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

@ishitatsuyuki @rust-highfive @bors @aturon @alexcrichton