diff options
Diffstat (limited to 'community/rust/alpine-target.patch')
-rw-r--r-- | community/rust/alpine-target.patch | 32 |
1 files changed, 14 insertions, 18 deletions
diff --git a/community/rust/alpine-target.patch b/community/rust/alpine-target.patch index f5425a5e78..b9f22b02f2 100644 --- a/community/rust/alpine-target.patch +++ b/community/rust/alpine-target.patch @@ -7,8 +7,8 @@ This adds `$arch-alpine-linux-musl` targets to Rust to encode our toolchain and distribution-specific quirks instead of polluting the main musl target of `$arch-unknown-linux-musl`. ---- a/src/librustc_back/target/mod.rs -+++ b/src/librustc_back/target/mod.rs +--- a/src/librustc_target/spec/mod.rs ++++ b/src/librustc_target/spec/mod.rs @@ -239,6 +239,11 @@ ("armv7-unknown-cloudabi-eabihf", armv7_unknown_cloudabi_eabihf), ("i686-unknown-cloudabi", i686_unknown_cloudabi), @@ -22,8 +22,8 @@ and distribution-specific quirks instead of polluting the main musl target of /// Everything `rustc` knows about how to compile for a specific target. --- /dev/null -+++ b/src/librustc_back/target/i586_alpine_linux_musl.rs -@@ -0,0 +1,36 @@ ++++ b/src/librustc_target/spec/i586_alpine_linux_musl.rs +@@ -0,0 +1,35 @@ +// Copyright 2017 The Rust Project Developers. See the COPYRIGHT +// file at the top-level directory of this distribution and at +// http://rust-lang.org/COPYRIGHT. @@ -34,8 +34,7 @@ and distribution-specific quirks instead of polluting the main musl target of +// option. This file may not be copied, modified, or distributed +// except according to those terms. + -+use LinkerFlavor; -+use target::{Target, TargetResult}; ++use spec::{LinkerFlavor, Target, TargetResult}; + +pub fn target() -> TargetResult { + let mut base = super::linux_musl_base::opts(); @@ -61,8 +60,8 @@ and distribution-specific quirks instead of polluting the main musl target of + }) +} --- /dev/null -+++ b/src/librustc_back/target/x86_64_alpine_linux_musl.rs -@@ -0,0 +1,36 @@ ++++ b/src/librustc_target/spec/x86_64_alpine_linux_musl.rs +@@ -0,0 +1,35 @@ +// Copyright 2017 The Rust Project Developers. See the COPYRIGHT +// file at the top-level directory of this distribution and at +// http://rust-lang.org/COPYRIGHT. @@ -73,8 +72,7 @@ and distribution-specific quirks instead of polluting the main musl target of +// option. This file may not be copied, modified, or distributed +// except according to those terms. + -+use LinkerFlavor; -+use target::{Target, TargetResult}; ++use spec::{LinkerFlavor, Target, TargetResult}; + +pub fn target() -> TargetResult { + let mut base = super::linux_musl_base::opts(); @@ -100,8 +98,8 @@ and distribution-specific quirks instead of polluting the main musl target of + }) +} --- /dev/null -+++ b/src/librustc_back/target/aarch64_alpine_linux_musl.rs -@@ -0,0 +1,39 @@ ++++ b/src/librustc_target/spec/aarch64_alpine_linux_musl.rs +@@ -0,0 +1,38 @@ +// Copyright 2017 The Rust Project Developers. See the COPYRIGHT +// file at the top-level directory of this distribution and at +// http://rust-lang.org/COPYRIGHT. @@ -112,8 +110,7 @@ and distribution-specific quirks instead of polluting the main musl target of +// option. This file may not be copied, modified, or distributed +// except according to those terms. + -+use LinkerFlavor; -+use target::{Target, TargetOptions, TargetResult}; ++use spec::{LinkerFlavor, Target, TargetOptions, TargetResult}; + +pub fn target() -> TargetResult { + let mut base = super::linux_musl_base::opts(); @@ -142,8 +139,8 @@ and distribution-specific quirks instead of polluting the main musl target of + }) +} --- /dev/null -+++ b/src/librustc_back/target/arm_alpine_linux_musleabihf.rs -@@ -0,0 +1,41 @@ ++++ b/src/librustc_target/spec/arm_alpine_linux_musleabihf.rs +@@ -0,0 +1,40 @@ +// Copyright 2017 The Rust Project Developers. See the COPYRIGHT +// file at the top-level directory of this distribution and at +// http://rust-lang.org/COPYRIGHT. @@ -154,8 +151,7 @@ and distribution-specific quirks instead of polluting the main musl target of +// option. This file may not be copied, modified, or distributed +// except according to those terms. + -+use LinkerFlavor; -+use target::{Target, TargetOptions, TargetResult}; ++use spec::{LinkerFlavor, Target, TargetOptions, TargetResult}; + +pub fn target() -> TargetResult { + let mut base = super::linux_musl_base::opts(); |