From 3f325091dd8ca8d2f89368ed44bd9cbebf25721e Mon Sep 17 00:00:00 2001 From: Marat Safin Date: Wed, 18 Oct 2017 15:22:28 +0300 Subject: community/rust: upgrade to 1.18 --- community/rust/alpine-target.patch | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'community/rust/alpine-target.patch') diff --git a/community/rust/alpine-target.patch b/community/rust/alpine-target.patch index e013a6bc2e..fc79b45b9a 100644 --- a/community/rust/alpine-target.patch +++ b/community/rust/alpine-target.patch @@ -8,7 +8,7 @@ and distribution-specific quirks instead of polluting the main musl target of --- /dev/null +++ b/src/librustc_back/target/i586_alpine_linux_musl.rs -@@ -0,0 +1,32 @@ +@@ -0,0 +1,34 @@ +// 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. @@ -19,6 +19,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}; + +pub fn target() -> TargetResult { @@ -38,6 +39,7 @@ and distribution-specific quirks instead of polluting the main musl target of + target_os: "linux".to_string(), + target_env: "musl".to_string(), + target_vendor: "alpine".to_string(), ++ linker_flavor: LinkerFlavor::Gcc, + options: base, + }) +} @@ -55,7 +57,7 @@ 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/x86_64_alpine_linux_musl.rs -@@ -0,0 +1,32 @@ +@@ -0,0 +1,34 @@ +// 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. @@ -66,6 +68,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}; + +pub fn target() -> TargetResult { @@ -85,6 +88,7 @@ and distribution-specific quirks instead of polluting the main musl target of + target_os: "linux".to_string(), + target_env: "musl".to_string(), + target_vendor: "alpine".to_string(), ++ linker_flavor: LinkerFlavor::Gcc, + options: base, + }) +} -- cgit v1.2.3