diff options
Diffstat (limited to 'rust/fix-linux_musl_base.patch')
| -rw-r--r-- | rust/fix-linux_musl_base.patch | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/rust/fix-linux_musl_base.patch b/rust/fix-linux_musl_base.patch index 8671a3f0..da4377f8 100644 --- a/rust/fix-linux_musl_base.patch +++ b/rust/fix-linux_musl_base.patch @@ -1,14 +1,14 @@ diff --git a/compiler/rustc_target/src/spec/base/linux_musl.rs b/compiler/rustc_target/src/spec/base/linux_musl.rs -index 1bef602..f81dbfa 100644 +index 6d3124b..a9cf0f9 100644 --- a/compiler/rustc_target/src/spec/base/linux_musl.rs +++ b/compiler/rustc_target/src/spec/base/linux_musl.rs @@ -1,11 +1,8 @@ --use crate::spec::{LinkSelfContainedDefault, TargetOptions, base, crt_objects}; -+use crate::spec::{base, TargetOptions}; +-use crate::spec::{Env, LinkSelfContainedDefault, TargetOptions, base, crt_objects}; ++use crate::spec::{base, Env, TargetOptions}; pub(crate) fn opts() -> TargetOptions { TargetOptions { - env: "musl".into(), + env: Env::Musl, - pre_link_objects_self_contained: crt_objects::pre_musl_self_contained(), - post_link_objects_self_contained: crt_objects::post_musl_self_contained(), - link_self_contained: LinkSelfContainedDefault::InferredForMusl, @@ -16,7 +16,7 @@ index 1bef602..f81dbfa 100644 } } diff --git a/compiler/rustc_target/src/spec/crt_objects.rs b/compiler/rustc_target/src/spec/crt_objects.rs -index e3b6430..13a96e2 100644 +index 2d84e78..0e6cb0f 100644 --- a/compiler/rustc_target/src/spec/crt_objects.rs +++ b/compiler/rustc_target/src/spec/crt_objects.rs @@ -62,28 +62,6 @@ pub(super) fn all(obj: &'static str) -> CrtObjects { @@ -47,7 +47,7 @@ index e3b6430..13a96e2 100644 - pub(super) fn pre_mingw_self_contained() -> CrtObjects { new(&[ - (LinkOutputKind::DynamicNoPicExe, &["crt2.o", "rsbegin.o"]), + (LinkOutputKind::DynamicNoPicExe, &["crt2.o"]), diff --git a/compiler/rustc_target/src/spec/targets/x86_64_unknown_linux_musl.rs b/compiler/rustc_target/src/spec/targets/x86_64_unknown_linux_musl.rs index 8dcdc5b..25f53d6 100644 --- a/compiler/rustc_target/src/spec/targets/x86_64_unknown_linux_musl.rs |