forked from kiss-community/repo
79 lines
3.4 KiB
Diff
79 lines
3.4 KiB
Diff
|
diff --git a/src/bootstrap/compile.rs b/src/bootstrap/compile.rs
|
||
|
|
index 8e5fe25..0d3e27e 100644
|
||
|
|
--- a/src/bootstrap/compile.rs
|
||
|
|
+++ b/src/bootstrap/compile.rs
|
||
|
|
@@ -136,7 +136,7 @@ fn copy_third_party_objects(builder: &Builder<'_>, compiler: &Compiler, target:
|
||
|
|
// with a glibc-targeting toolchain, given we have the appropriate startup
|
||
|
|
// files. As those shipped with glibc won't work, copy the ones provided by
|
||
|
|
// musl so we have them on linux-gnu hosts.
|
||
|
|
- if target.contains("musl") {
|
||
|
|
+ if target.contains("noop") {
|
||
|
|
let srcdir = builder.musl_root(target).unwrap().join("lib");
|
||
|
|
for &obj in &["crt1.o", "crti.o", "crtn.o"] {
|
||
|
|
copy_and_stamp(&srcdir, obj);
|
||
|
|
diff --git a/src/bootstrap/sanity.rs b/src/bootstrap/sanity.rs
|
||
|
|
index bffe748f3..40f9f597f 100644
|
||
|
|
--- a/src/bootstrap/sanity.rs
|
||
|
|
+++ b/src/bootstrap/sanity.rs
|
||
|
|
@@ -188,7 +188,7 @@ pub fn check(build: &mut Build) {
|
||
|
|
}
|
||
|
|
|
||
|
|
// Make sure musl-root is valid
|
||
|
|
- if target.contains("musl") {
|
||
|
|
+ if target.contains("noop") {
|
||
|
|
// If this is a native target (host is also musl) and no musl-root is given,
|
||
|
|
// fall back to the system toolchain in /usr before giving up
|
||
|
|
if build.musl_root(*target).is_none() && build.config.build == *target {
|
||
|
|
diff --git a/src/librustc_target/spec/linux_musl_base.rs b/src/librustc_target/spec/linux_musl_base.rs
|
||
|
|
index e294e6398..17fecb3b2 100644
|
||
|
|
--- a/src/librustc_target/spec/linux_musl_base.rs
|
||
|
|
+++ b/src/librustc_target/spec/linux_musl_base.rs
|
||
|
|
@@ -26,7 +26,7 @@ pub fn opts() -> TargetOptions {
|
||
|
|
base.post_link_objects_crt.push("crtn.o".to_string());
|
||
|
|
|
||
|
|
// These targets statically link libc by default
|
||
|
|
- base.crt_static_default = true;
|
||
|
|
+ base.crt_static_default = false;
|
||
|
|
// These targets allow the user to choose between static and dynamic linking.
|
||
|
|
base.crt_static_respected = true;
|
||
|
|
|
||
|
|
diff --git a/src/libunwind/build.rs b/src/libunwind/build.rs
|
||
|
|
index f24d957d6..4632212fd 100644
|
||
|
|
--- a/src/libunwind/build.rs
|
||
|
|
+++ b/src/libunwind/build.rs
|
||
|
|
@@ -10,7 +10,7 @@ fn main() {
|
||
|
|
// Build the unwinding from libunwind C/C++ source code.
|
||
|
|
llvm_libunwind::compile();
|
||
|
|
} else if target.contains("linux") {
|
||
|
|
- if target.contains("musl") {
|
||
|
|
+ if target.contains("noop") {
|
||
|
|
// linking for musl is handled in lib.rs
|
||
|
|
llvm_libunwind::compile();
|
||
|
|
} else if !target.contains("android") {
|
||
|
|
diff --git a/src/libunwind/lib.rs b/src/libunwind/lib.rs
|
||
|
|
index 8d9164471..3adaaf43d 100644
|
||
|
|
--- a/src/libunwind/lib.rs
|
||
|
|
+++ b/src/libunwind/lib.rs
|
||
|
|
@@ -20,7 +20,7 @@ cfg_if::cfg_if! {
|
||
|
|
}
|
||
|
|
}
|
||
|
|
|
||
|
|
-#[cfg(target_env = "musl")]
|
||
|
|
+#[cfg(target_env = "noop")]
|
||
|
|
#[link(name = "unwind", kind = "static", cfg(target_feature = "crt-static"))]
|
||
|
|
#[link(name = "gcc_s", cfg(not(target_feature = "crt-static")))]
|
||
|
|
extern {}
|
||
|
|
diff --git a/vendor/libc/src/unix/mod.rs b/vendor/libc/src/unix/mod.rs
|
||
|
|
index 721d24116..26bf271cd 100644
|
||
|
|
--- a/vendor/libc/src/unix/mod.rs
|
||
|
|
+++ b/vendor/libc/src/unix/mod.rs
|
||
|
|
@@ -296,7 +296,7 @@ cfg_if! {
|
||
|
|
} else if #[cfg(feature = "std")] {
|
||
|
|
// cargo build, don't pull in anything extra as the libstd dep
|
||
|
|
// already pulls in all libs.
|
||
|
|
- } else if #[cfg(target_env = "musl")] {
|
||
|
|
+ } else if #[cfg(target_env = "noop")] {
|
||
|
|
#[cfg_attr(feature = "rustc-dep-of-std",
|
||
|
|
link(name = "c", kind = "static",
|
||
|
|
cfg(target_feature = "crt-static")))]
|