From 33ac973ede2c424e9efe74c9c0f39e7898bce3f6 Mon Sep 17 00:00:00 2001 From: Woodpecker CI Date: Fri, 22 Aug 2025 00:13:47 +0000 Subject: Woodpecker CI b6c26953ecfb6317380620c86cf65c233d281da2 [SKIP CI] --- rust/fix-linux_musl_base.patch | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) (limited to 'rust/fix-linux_musl_base.patch') diff --git a/rust/fix-linux_musl_base.patch b/rust/fix-linux_musl_base.patch index acd156e1..8671a3f0 100644 --- a/rust/fix-linux_musl_base.patch +++ b/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 -- cgit v1.2.3