Skip to content

rustbuild: fix building std for musl targets #36144

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.

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

Merged
merged 3 commits into from
Sep 4, 2016

Conversation

japaric
Copy link
Member

@japaric japaric commented Aug 30, 2016

closes #36143

r? @alexcrichton

@rust-highfive
Copy link
Contributor

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.

@@ -35,7 +35,7 @@ fn main() {
println!("cargo:rustc-link-lib=dl");
println!("cargo:rustc-link-lib=log");
println!("cargo:rustc-link-lib=gcc");
} else {
} else if !target.contains("musl") {
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

hold on. we still need to pass these for mips-musl

}
}

/// Copies the crt(1,i,n).o startup objects
///
/// Only required for musl targets that statically link to libc
fn copy_third_party_objects(build: &Build, target: &str, into: &Path) {
fn copy_third_party_objects(build: &Build, into: &Path) {
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can you change the name here to copy_musl_third_party_object as this only works for musl now?

@japaric
Copy link
Member Author

japaric commented Aug 30, 2016

Can you change the name here to copy_musl_third_party_object

Done

@alexcrichton
Copy link
Member

@bors: r+

This makes me realize we need to move musl-root to the target-specific configuration as well!

@bors
Copy link
Collaborator

bors commented Aug 31, 2016

📌 Commit 25145b2 has been approved by alexcrichton

@bors
Copy link
Collaborator

bors commented Sep 2, 2016

⌛ Testing commit 25145b2 with merge 8aac9e2...

@bors
Copy link
Collaborator

bors commented Sep 2, 2016

💔 Test failed - auto-win-msvc-64-cargotest

@alexcrichton
Copy link
Member

@bors: retry

On Fri, Sep 2, 2016 at 9:00 AM, bors [email protected] wrote:

💔 Test failed - auto-win-msvc-64-cargotest
https://buildbot.rust-lang.org/builders/auto-win-msvc-64-cargotest/builds/1710


You are receiving this because you were mentioned.
Reply to this email directly, view it on GitHub
#36144 (comment), or mute
the thread
https://github.com/notifications/unsubscribe-auth/AAD95GHKkV0Y7LQiiBfSivBlXs8HgHN8ks5qmEgngaJpZM4Jwpu2
.

@bors
Copy link
Collaborator

bors commented Sep 4, 2016

⌛ Testing commit 25145b2 with merge 9cc430d...

bors added a commit that referenced this pull request Sep 4, 2016
rustbuild: fix building std for musl targets

closes #36143

r? @alexcrichton
@bors bors merged commit 25145b2 into rust-lang:master Sep 4, 2016
@japaric japaric deleted the rustbuild-musl branch September 6, 2016 02:21
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

rustbuild incorrectly builds std for musl targets
4 participants