diff options
| author | Marat Safin <jeizsm@gmail.com> | 2017-10-18 15:22:28 +0300 |
|---|---|---|
| committer | Jakub Jirutka <jakub@jirutka.cz> | 2017-10-23 17:40:45 +0200 |
| commit | 3f325091dd8ca8d2f89368ed44bd9cbebf25721e (patch) | |
| tree | 7e038b184ed0295db0cbd891ec433428a1d1189c /community/rust/musl-fix-linux_musl_base.patch | |
| parent | 131105ff61d3bf6272f1fee753fef42f0147eff8 (diff) | |
| download | aports-3f325091dd8ca8d2f89368ed44bd9cbebf25721e.tar.bz2 aports-3f325091dd8ca8d2f89368ed44bd9cbebf25721e.tar.xz | |
community/rust: upgrade to 1.18
Diffstat (limited to 'community/rust/musl-fix-linux_musl_base.patch')
| -rw-r--r-- | community/rust/musl-fix-linux_musl_base.patch | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/community/rust/musl-fix-linux_musl_base.patch b/community/rust/musl-fix-linux_musl_base.patch index 38194290cb..f2efb065e0 100644 --- a/community/rust/musl-fix-linux_musl_base.patch +++ b/community/rust/musl-fix-linux_musl_base.patch @@ -12,13 +12,13 @@ See https://github.com/rust-lang/rust/pull/40113 - // Make sure that the linker/gcc really don't pull in anything, including - // default objects, libs, etc. -- base.pre_link_args.push("-nostdlib".to_string()); +- base.pre_link_args.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 // when unwinding to locate the unwinding information. I'm not sure why this // argument is *not* necessary for normal builds, but it can't hurt! - base.pre_link_args.push("-Wl,--eh-frame-hdr".to_string()); + base.pre_link_args.get_mut(&LinkerFlavor::Gcc).unwrap().push("-Wl,--eh-frame-hdr".to_string()); - // There's a whole bunch of circular dependencies when dealing with MUSL - // unfortunately. To put this in perspective libc is statically linked to @@ -42,8 +42,8 @@ See https://github.com/rust-lang/rust/pull/40113 - // link everything as a group, not stripping anything out until everything - // is processed. The linker will still perform a pass to strip out object - // files but it won't do so until all objects/archives have been processed. -- base.pre_link_args.push("-Wl,-(".to_string()); -- base.post_link_args.push("-Wl,-)".to_string()); +- base.pre_link_args.get_mut(&LinkerFlavor::Gcc).unwrap().push("-Wl,-(".to_string()); +- base.post_link_args.insert(LinkerFlavor::Gcc, vec!["-Wl,-)".to_string()]); - - // When generating a statically linked executable there's generally some - // small setup needed which is listed in these files. These are provided by |