Skip to content

Conversation

smaeul
Copy link
Contributor

@smaeul smaeul commented Aug 24, 2017

Fixes #40113, #44069, and clux/muslrust#16.

libunwind.a is not copied from musl_root, so it must be integrated into the unwind crate.

@aidanhs
Copy link
Contributor

aidanhs commented Aug 24, 2017

r? @alexcrichton

@bors p=1
(ideally get it into the next nightly)

@alexcrichton
Copy link
Member

@bors: r+

@bors
Copy link
Collaborator

bors commented Aug 24, 2017

📌 Commit 3a8b00d has been approved by alexcrichton

@alexcrichton alexcrichton added the S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. label Aug 24, 2017
@bors
Copy link
Collaborator

bors commented Aug 24, 2017

⌛ Testing commit 3a8b00d654d23d13484979a95ab873bd75f24a4f with merge c309b6f5378c92cef3584bc4ab85e06e350ab4ee...

@bors
Copy link
Collaborator

bors commented Aug 24, 2017

💔 Test failed - status-travis

@alexcrichton
Copy link
Member

Want to just put a cfg on the attribute to avoid ever emitting the attribute on mips for now?

@smaeul
Copy link
Contributor Author

smaeul commented Aug 24, 2017

@alexcrichton Yes, doing that now

@alexcrichton
Copy link
Member

@bors: r+

@bors
Copy link
Collaborator

bors commented Aug 24, 2017

📌 Commit dbcaf6c has been approved by alexcrichton

@bors
Copy link
Collaborator

bors commented Aug 24, 2017

⌛ Testing commit dbcaf6c with merge 65c2ad6777c21cef7e51e1613713026857199d6b...

@bors
Copy link
Collaborator

bors commented Aug 24, 2017

💔 Test failed - status-travis

@aidanhs
Copy link
Contributor

aidanhs commented Aug 24, 2017

@bors retry #43283

@bors
Copy link
Collaborator

bors commented Aug 25, 2017

⌛ Testing commit dbcaf6c with merge 0cbe6d8...

bors added a commit that referenced this pull request Aug 25, 2017
Do not assume libunwind.a is available on musl

Fixes #40113, #44069, and clux/muslrust#16.

libunwind.a is not copied from musl_root, so it must be integrated into the unwind crate.
@bors
Copy link
Collaborator

bors commented Aug 25, 2017

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

@bors bors merged commit dbcaf6c into rust-lang:master Aug 25, 2017
@alexcrichton
Copy link
Member

Thanks again for the quick fix @smaeul!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants