Skip to content

fix building with dynamically linked musl #105

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix building with dynamically linked musl #105

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions crash-handler/src/unix/pthread_interpose.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ struct PthreadCreateParams {
/// in the `pthread_key` destructor
static mut THREAD_DESTRUCTOR_KEY: libc::pthread_key_t = 0;

#[cfg(all(target_env = "musl", not(miri)))]
#[cfg(all(target_env = "musl", target_feature = "crt-static", not(miri)))]
unsafe extern "C" {
/// This is the weak alias for `pthread_create`. We declare this so we can
/// use its address when targeting musl, as we can't lookup the actual
Expand Down Expand Up @@ -66,7 +66,7 @@ pub extern "C" fn pthread_create(
// used to uninstall and unmap the alternate stack
INIT.call_once(|| unsafe {
cfg_if::cfg_if! {
if #[cfg(target_env = "musl")] {
if #[cfg(all(target_env = "musl", target_feature = "crt-static"))] {
let ptr = __pthread_create as *mut c_void;
} else {
const RTLD_NEXT: *mut c_void = -1isize as *mut c_void;
Expand Down