diff options
Diffstat (limited to 'srcpkgs/rust/patches/0014-copy-new-version-of-need-ssp_nonshared.patch-from-al.patch')
-rw-r--r-- | srcpkgs/rust/patches/0014-copy-new-version-of-need-ssp_nonshared.patch-from-al.patch | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/srcpkgs/rust/patches/0014-copy-new-version-of-need-ssp_nonshared.patch-from-al.patch b/srcpkgs/rust/patches/0014-copy-new-version-of-need-ssp_nonshared.patch-from-al.patch index ec26d9c26ae..df82caa9dd6 100644 --- a/srcpkgs/rust/patches/0014-copy-new-version-of-need-ssp_nonshared.patch-from-al.patch +++ b/srcpkgs/rust/patches/0014-copy-new-version-of-need-ssp_nonshared.patch-from-al.patch @@ -5,24 +5,24 @@ Subject: [PATCH 14/15] copy new version of need-ssp_nonshared.patch from alpine --- - library/std/src/sys/unix/mod.rs | 4 ++++ + library/std/src/sys/pal/unix/mod.rs | 4 ++++ 1 file changed, 4 insertions(+) -diff --git a/library/std/src/sys/unix/mod.rs b/library/std/src/sys/unix/mod.rs -index 34a023b02..934a87570 100644 ---- a/library/std/src/sys/unix/mod.rs -+++ b/library/std/src/sys/unix/mod.rs -@@ -297,6 +297,10 @@ cfg_if::cfg_if! { - #[link(name = "dl")] - #[link(name = "log")] +diff --git a/library/std/src/sys/pal/unix/mod.rs b/library/std/src/sys/pal/unix/mod.rs +index 43cb9d89b..4158c79da 100644 +--- a/library/std/src/sys/pal/unix/mod.rs ++++ b/library/std/src/sys/pal/unix/mod.rs +@@ -379,6 +379,10 @@ cfg_if::cfg_if! { + #[link(name = "dl", cfg(not(target_feature = "crt-static")))] + #[link(name = "log", cfg(not(target_feature = "crt-static")))] extern "C" {} + } else if #[cfg(all(target_os = "linux", target_env = "musl"))] { -+ #[link(name = "ssp_nonshared")] ++ #[link(name = "ssp_nonshared")] + #[link(name = "execinfo")] -+ extern "C" {} ++ extern "C" {} } else if #[cfg(target_os = "freebsd")] { #[link(name = "execinfo")] #[link(name = "pthread")] -- -2.37.2 +2.44.0 |