2017-01-03 22:32:49 +00:00
|
|
|
--- a/src/bootstrap/compile.rs
|
|
|
|
+++ b/src/bootstrap/compile.rs
|
2017-01-03 22:26:21 +00:00
|
|
|
@@ -89,10 +89,6 @@
|
|
|
|
t!(fs::create_dir_all(&libdir));
|
|
|
|
}
|
|
|
|
add_to_sysroot(&out_dir, &libdir);
|
|
|
|
-
|
|
|
|
- if target.contains("musl") && !target.contains("mips") {
|
|
|
|
- copy_musl_third_party_objects(build, target, &libdir);
|
|
|
|
- }
|
|
|
|
}
|
|
|
|
|
|
|
|
/// Copies the crt(1,i,n).o startup objects
|
2017-01-03 22:32:49 +00:00
|
|
|
--- a/src/bootstrap/sanity.rs
|
|
|
|
+++ b/src/bootstrap/sanity.rs
|
2017-01-03 22:26:21 +00:00
|
|
|
@@ -132,27 +132,6 @@
|
2016-08-06 20:41:08 +00:00
|
|
|
panic!("the iOS target is only supported on OSX");
|
|
|
|
}
|
2016-11-12 17:41:23 +00:00
|
|
|
|
2016-08-06 20:41:08 +00:00
|
|
|
- // Make sure musl-root is valid if specified
|
2016-09-30 13:14:41 +00:00
|
|
|
- if target.contains("musl") && !target.contains("mips") {
|
2016-11-12 17:41:23 +00:00
|
|
|
- match build.musl_root(target) {
|
|
|
|
- Some(root) => {
|
2016-08-06 20:41:08 +00:00
|
|
|
- if fs::metadata(root.join("lib/libc.a")).is_err() {
|
|
|
|
- panic!("couldn't find libc.a in musl dir: {}",
|
|
|
|
- root.join("lib").display());
|
|
|
|
- }
|
|
|
|
- if fs::metadata(root.join("lib/libunwind.a")).is_err() {
|
|
|
|
- panic!("couldn't find libunwind.a in musl dir: {}",
|
|
|
|
- root.join("lib").display());
|
|
|
|
- }
|
|
|
|
- }
|
|
|
|
- None => {
|
2017-01-03 22:26:21 +00:00
|
|
|
- panic!("when targeting MUSL either the rust.musl-root \
|
|
|
|
- option or the target.$TARGET.musl-root option must \
|
2016-11-12 17:41:23 +00:00
|
|
|
- be specified in config.toml")
|
2016-08-06 20:41:08 +00:00
|
|
|
- }
|
|
|
|
- }
|
|
|
|
- }
|
|
|
|
-
|
|
|
|
if target.contains("msvc") {
|
|
|
|
// There are three builds of cmake on windows: MSVC, MinGW, and
|
|
|
|
// Cygwin. The Cygwin build does not have generators for Visual
|