diff options
| author | emmett1 <emmett1.2miligrams@protonmail.com> | 2025-08-22 00:05:25 +0000 |
|---|---|---|
| committer | emmett1 <emmett1.2miligrams@protonmail.com> | 2025-08-22 00:05:25 +0000 |
| commit | b6c26953ecfb6317380620c86cf65c233d281da2 (patch) | |
| tree | 54a3f1b25796d51e82081684fd940dc35ee0d0df /repos/extra/rust/fix-linux_musl_base.patch | |
| parent | ff955a3c29b5149ca2e5715dc4df4fee2c835da7 (diff) | |
| download | alicelinux-b6c26953ecfb6317380620c86cf65c233d281da2.tar.gz alicelinux-b6c26953ecfb6317380620c86cf65c233d281da2.zip | |
rust: updated to 1.89.0
Diffstat (limited to 'repos/extra/rust/fix-linux_musl_base.patch')
| -rw-r--r-- | repos/extra/rust/fix-linux_musl_base.patch | 19 |
1 files changed, 9 insertions, 10 deletions
diff --git a/repos/extra/rust/fix-linux_musl_base.patch b/repos/extra/rust/fix-linux_musl_base.patch index acd156e1..8671a3f0 100644 --- a/repos/extra/rust/fix-linux_musl_base.patch +++ b/repos/extra/rust/fix-linux_musl_base.patch @@ -1,20 +1,19 @@ diff --git a/compiler/rustc_target/src/spec/base/linux_musl.rs b/compiler/rustc_target/src/spec/base/linux_musl.rs -index 1a854fe..7b0cc7b 100644 +index 1bef602..f81dbfa 100644 --- a/compiler/rustc_target/src/spec/base/linux_musl.rs +++ b/compiler/rustc_target/src/spec/base/linux_musl.rs -@@ -1,12 +1,9 @@ +@@ -1,11 +1,8 @@ -use crate::spec::{LinkSelfContainedDefault, TargetOptions, base, crt_objects}; +use crate::spec::{base, TargetOptions}; pub(crate) fn opts() -> TargetOptions { - let mut base = base::linux::opts(); - - base.env = "musl".into(); -- base.pre_link_objects_self_contained = crt_objects::pre_musl_self_contained(); -- base.post_link_objects_self_contained = crt_objects::post_musl_self_contained(); -- base.link_self_contained = LinkSelfContainedDefault::InferredForMusl; - - base + TargetOptions { + env: "musl".into(), +- 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, + ..base::linux::opts() + } } diff --git a/compiler/rustc_target/src/spec/crt_objects.rs b/compiler/rustc_target/src/spec/crt_objects.rs index e3b6430..13a96e2 100644 |