aboutsummaryrefslogtreecommitdiff
path: root/repos/extra/rust/fix-linux_musl_base.patch
diff options
context:
space:
mode:
Diffstat (limited to 'repos/extra/rust/fix-linux_musl_base.patch')
-rwxr-xr-xrepos/extra/rust/fix-linux_musl_base.patch57
1 files changed, 0 insertions, 57 deletions
diff --git a/repos/extra/rust/fix-linux_musl_base.patch b/repos/extra/rust/fix-linux_musl_base.patch
deleted file mode 100755
index a9293008..00000000
--- a/repos/extra/rust/fix-linux_musl_base.patch
+++ /dev/null
@@ -1,57 +0,0 @@
-From: Jakub Jirutka <jakub@jirutka.cz>
-Date: Sat, 08 Aug 2016 15:06:00 +0200
-Subject: [PATCH] Fix linux_musl_base for native musl host
-
-See https://github.com/rust-lang/rust/pull/40113
-
---- a/compiler/rustc_target/src/spec/base/linux_musl.rs
-+++ b/compiler/rustc_target/src/spec/base/linux_musl.rs
-@@ -1,15 +1,12 @@
--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;
-
- // These targets statically link libc by default
-- base.crt_static_default = true;
-+ base.crt_static_default = false;
-
- base
- }
---- a/compiler/rustc_target/src/spec/crt_objects.rs
-+++ b/compiler/rustc_target/src/spec/crt_objects.rs
-@@ -58,28 +61,6 @@
- (LinkOutputKind::StaticPicExe, &[obj]),
- (LinkOutputKind::DynamicDylib, &[obj]),
- (LinkOutputKind::StaticDylib, &[obj]),
-- ])
--}
--
--pub(super) fn pre_musl_self_contained() -> CrtObjects {
-- new(&[
-- (LinkOutputKind::DynamicNoPicExe, &["crt1.o", "crti.o", "crtbegin.o"]),
-- (LinkOutputKind::DynamicPicExe, &["Scrt1.o", "crti.o", "crtbeginS.o"]),
-- (LinkOutputKind::StaticNoPicExe, &["crt1.o", "crti.o", "crtbegin.o"]),
-- (LinkOutputKind::StaticPicExe, &["rcrt1.o", "crti.o", "crtbeginS.o"]),
-- (LinkOutputKind::DynamicDylib, &["crti.o", "crtbeginS.o"]),
-- (LinkOutputKind::StaticDylib, &["crti.o", "crtbeginS.o"]),
-- ])
--}
--
--pub(super) fn post_musl_self_contained() -> CrtObjects {
-- new(&[
-- (LinkOutputKind::DynamicNoPicExe, &["crtend.o", "crtn.o"]),
-- (LinkOutputKind::DynamicPicExe, &["crtendS.o", "crtn.o"]),
-- (LinkOutputKind::StaticNoPicExe, &["crtend.o", "crtn.o"]),
-- (LinkOutputKind::StaticPicExe, &["crtendS.o", "crtn.o"]),
-- (LinkOutputKind::DynamicDylib, &["crtendS.o", "crtn.o"]),
-- (LinkOutputKind::StaticDylib, &["crtendS.o", "crtn.o"]),
- ])
- }
-