rustbuild: fix cross compilation of libstd to i686-unknown-linux-musl #32078
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
- make sure we copy the third party objects (crt*.o) to the target stage directory. - apply the x86_64-musl logic also to the i686-musl target.
| @@ -111,7 +111,7 @@ fn main() { | |||
| println!("cargo:rustc-link-search=native={}/lib", build_dir.display()); | |||
| if target.contains("android") { | |||
| println!("cargo:rustc-link-lib=gcc"); | |||
| } else if !target.contains("windows") { | |||
| } else if !target.contains("windows") && !target.contains("musl") { | |||
There was a problem hiding this comment.
Updated logic to match non-rustbuild builds. See
rust/src/liballoc_jemalloc/lib.rs
Lines 37 to 40 in c116ae3
|
Looks good to me, thanks @japaric! r=me once libc is updated |
japaric
changed the title
|
@bors: r=alexcrichton |
|
📌 Commit f164433 has been approved by |
|
⌛ Testing commit f164433 with merge 9fac71b... |
|
💔 Test failed - auto-mac-64-nopt-t |
|
@bors: retry On Sun, Mar 6, 2016 at 10:54 PM, bors [email protected] wrote:
|
bors
added a commit
that referenced
this pull request
Mar 7, 2016
- make sure we copy the third party objects (crt*.o) to the target stage directory. - apply the x86_64-musl logic also to the i686-musl target. --- r? @alexcrichton
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
r? @alexcrichton