Skip to content

rustbuild: fix cross compilation of libstd to i686-unknown-linux-musl #32078

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.

Sign up for GitHub

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 2 commits into from
Mar 7, 2016
Merged

rustbuild: fix cross compilation of libstd to i686-unknown-linux-musl #32078

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0b7fc06
rustbuild: fix cross compilation of libstd to i686-unknown-linux-musl
Mar 6, 2016
f164433
update the src/liblibc submodule
Mar 6, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 13 additions & 0 deletions src/bootstrap/build/compile.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,6 +83,19 @@ pub fn std_link(build: &Build,
libdir.join(staticlib("compiler-rt", target))));
}
add_to_sysroot(&out_dir, &libdir);

if target.contains("musl") && (target.contains("x86_64") || target.contains("i686")) {
copy_third_party_objects(build, target, &libdir);
}
}

/// 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) {
for &obj in &["crt1.o", "crti.o", "crtn.o"] {
t!(fs::copy(compiler_file(build.cc(target), obj), into.join(obj)));
}
}

/// Build and prepare startup objects like rsbegin.o and rsend.o
Expand Down
2 changes: 1 addition & 1 deletion src/bootstrap/build/sanity.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ pub fn check(build: &mut Build) {
}

// Make sure musl-root is valid if specified
if target.contains("musl") && target.contains("x86_64") {
if target.contains("musl") && (target.contains("x86_64") || target.contains("i686")) {
match build.config.musl_root {
Some(ref root) => {
if fs::metadata(root.join("lib/libc.a")).is_err() {
Expand Down
2 changes: 1 addition & 1 deletion src/liballoc_jemalloc/build.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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") {
Copy link
Contributor Author

Choose a reason for hiding this comment

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

Updated logic to match non-rustbuild builds. See

rust/src/liballoc_jemalloc/lib.rs

Lines 37 to 40 in c116ae3

#[cfg_attr(all(not(windows),
not(target_os = "android"),
not(target_env = "musl")),
link(name = "pthread"))]

println!("cargo:rustc-link-lib=pthread");
}
}
2 changes: 1 addition & 1 deletion src/liblibc
Open in desktop
Submodule liblibc updated 32 files
+4 −3 .travis.yml
+4 −24 ci/run-travis.sh
+204 −0 ci/style.rs
+4 −4 src/unix/bsd/apple/b32.rs
+4 −4 src/unix/bsd/apple/b64.rs
+5 −5 src/unix/bsd/freebsdlike/dragonfly/mod.rs
+9 −4 src/unix/bsd/freebsdlike/freebsd/mod.rs
+6 −6 src/unix/bsd/freebsdlike/mod.rs
+7 −2 src/unix/bsd/openbsdlike/mod.rs
+30 −21 src/unix/mod.rs
+2 −0 src/unix/notbsd/android/b32.rs
+2 −0 src/unix/notbsd/android/b64.rs
+4 −4 src/unix/notbsd/android/mod.rs
+5 −2 src/unix/notbsd/linux/mips.rs
+36 −33 src/unix/notbsd/linux/mod.rs
+84 −76 src/unix/notbsd/linux/musl/b32/arm.rs
+84 −76 src/unix/notbsd/linux/musl/b32/asmjs.rs
+2 −0 src/unix/notbsd/linux/musl/b32/mips.rs
+3 −3 src/unix/notbsd/linux/musl/b32/mod.rs
+85 −76 src/unix/notbsd/linux/musl/b32/x86.rs
+100 −97 src/unix/notbsd/linux/musl/b64/mod.rs
+2 −0 src/unix/notbsd/linux/other/b32/arm.rs
+11 −11 src/unix/notbsd/linux/other/b32/mod.rs
+2 −0 src/unix/notbsd/linux/other/b32/powerpc.rs
+22 −18 src/unix/notbsd/linux/other/b32/x86.rs
+23 −21 src/unix/notbsd/linux/other/b64/aarch64.rs
+23 −21 src/unix/notbsd/linux/other/b64/powerpc64.rs
+36 −35 src/unix/notbsd/linux/other/b64/x86_64.rs
+36 −38 src/unix/notbsd/linux/other/mod.rs
+14 −6 src/unix/notbsd/mod.rs
+1 −0 src/unix/solaris/mod.rs
+4 −2 src/windows.rs
2 changes: 1 addition & 1 deletion src/libstd/build.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ fn main() {
}

if target.contains("unknown-linux") {
if target.contains("musl") && target.contains("x86_64") {
if target.contains("musl") && (target.contains("x86_64") || target.contains("i686")) {
println!("cargo:rustc-link-lib=static=unwind");
} else {
println!("cargo:rustc-link-lib=dl");
Expand Down
10 changes: 8 additions & 2 deletions src/libstd/sys/common/libunwind.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,9 +106,15 @@ pub type _Unwind_Exception_Cleanup_Fn =
#[cfg_attr(any(all(target_os = "linux", not(target_env = "musl")),
target_os = "freebsd",
target_os = "solaris",
all(target_os = "linux", target_env = "musl", not(target_arch = "x86_64"))),
all(target_os = "linux",
target_env = "musl",
not(target_arch = "x86"),
not(target_arch = "x86_64"))),
link(name = "gcc_s"))]
#[cfg_attr(all(target_os = "linux", target_env = "musl", target_arch = "x86_64", not(test)),
#[cfg_attr(all(target_os = "linux",
target_env = "musl",
any(target_arch = "x86", target_arch = "x86_64"),
not(test)),
link(name = "unwind", kind = "static"))]
#[cfg_attr(any(target_os = "android", target_os = "openbsd"),
link(name = "gcc"))]
Expand Down