Attempt to fix musl build.

[clarfonthey]

Follow-up to #685 and #700.

[alexcrichton]

Thanks! Looks good to me, but CI is failing?

[clarfonthey]

Fixed the style errors; waiting for Travis again.

[clarfonthey]

It appears to be passing!

[alexcrichton]

@bors: r+

[bors]

📌 Commit 59904c6 has been approved by alexcrichton

[bors]

⌛ Testing commit 59904c6 with merge 334abbc...

[alexcrichton]

@bors: r- retry

er actually, can you verify this works in the rustc repo?

[bors]

☀️ Test successful - status-appveyor, status-travis
State: approved= try=False

[clarfonthey]

I made a PR for the rustc repo to test it out; I think that's how this is supposed to work?

[clarfonthey]

@alexcrichton it seems to work in the PR I made, so, I think this is okay to merge?

[alexcrichton]

Er what I mean is to actually test this. For example actually build libstd for these targets and make sure it works.

One error, for example, is that stdbuild is no longer a thing. For example this PR as-is should break linkage on all these targets.

[bors]

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

[marioidival]

@clarcharr you can fix the conflict?
@alexcrichton after conflict, need more changes here?

[alexcrichton]

Ah I think I'll close for inactivity for now, but this'll just need to be tested against rust-lang/rust before merging.