af802e87d4
- rebase patches - fix type of 'llvm-unwind' in config.toml - move linux_musl_base stuff to a single patch which makes it behave just line linux_gnu_base - copy new version of need-ssp_nonshared.patch from alpine - temporary workaround for the new rust-llvm-dwp binary: it's copied from the llvm toolchain and shoved into /usr/lib, but they copied the binary from the build machine - fix do_check (thanks cinerea0) - preliminary ppcle patches (q66)
13 lines
475 B
Diff
13 lines
475 B
Diff
--- a/library/std/src/sys/unix/mod.rs
|
|
+++ b/library/std/src/sys/unix/mod.rs
|
|
@@ -212,6 +212,10 @@ cfg_if::cfg_if! {
|
|
#[link(name = "log")]
|
|
#[link(name = "gcc")]
|
|
extern "C" {}
|
|
+ } else if #[cfg(all(target_os = "linux", target_env = "musl"))] {
|
|
+ #[link(name = "ssp_nonshared")]
|
|
+ #[link(name = "execinfo")]
|
|
+ extern "C" {}
|
|
} else if #[cfg(target_os = "freebsd")] {
|
|
#[link(name = "execinfo")]
|
|
#[link(name = "pthread")]
|