From e6200a5c61a35d55afeef51bd3117ddeef751aec Mon Sep 17 00:00:00 2001 From: Jakub Jirutka Date: Fri, 3 Aug 2018 13:44:05 +0200 Subject: community/rust: upgrade to 1.28.0 --- community/rust/musl-fix-linux_musl_base.patch | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) (limited to 'community/rust/musl-fix-linux_musl_base.patch') diff --git a/community/rust/musl-fix-linux_musl_base.patch b/community/rust/musl-fix-linux_musl_base.patch index 4ddcac9d40..e342f448fc 100644 --- a/community/rust/musl-fix-linux_musl_base.patch +++ b/community/rust/musl-fix-linux_musl_base.patch @@ -6,13 +6,14 @@ See https://github.com/rust-lang/rust/pull/40113 --- a/src/librustc_target/spec/linux_musl_base.rs +++ b/src/librustc_target/spec/linux_musl_base.rs -@@ -14,54 +14,14 @@ +@@ -13,53 +13,12 @@ pub fn opts() -> TargetOptions { let mut base = super::linux_base::opts(); - // Make sure that the linker/gcc really don't pull in anything, including - // default objects, libs, etc. -- base.pre_link_args.get_mut(&LinkerFlavor::Gcc).unwrap().push("-nostdlib".to_string()); +- base.pre_link_args_crt.insert(LinkerFlavor::Gcc, Vec::new()); +- base.pre_link_args_crt.get_mut(&LinkerFlavor::Gcc).unwrap().push("-nostdlib".to_string()); - // At least when this was tested, the linker would not add the // `GNU_EH_FRAME` program header to executables generated, which is required @@ -52,14 +53,10 @@ See https://github.com/rust-lang/rust/pull/40113 - // - // Each target directory for musl has these object files included in it so - // they'll be included from there. -- base.pre_link_objects_exe.push("crt1.o".to_string()); -- base.pre_link_objects_exe.push("crti.o".to_string()); -- base.post_link_objects.push("crtn.o".to_string()); +- base.pre_link_objects_exe_crt.push("crt1.o".to_string()); +- base.pre_link_objects_exe_crt.push("crti.o".to_string()); +- base.post_link_objects_crt.push("crtn.o".to_string()); - // These targets statically link libc by default base.crt_static_default = true; // These targets allow the user to choose between static and dynamic linking. - base.crt_static_respected = true; - - base - } -- cgit v1.2.3