Skip to content

Commit 1ca8d0b

Browse files
authored
Rollup merge of #93350 - gburgessiv:master, r=Mark-Simulacrum
libunwind: readd link attrs to _Unwind_Backtrace It seems the removal of these in 1c07096 was unintended; readding them fixes the build. fixes #93349 r? `@alexcrichton`
2 parents d137c3a + 4d25c51 commit 1ca8d0b

File tree

1 file changed

+4
-0
lines changed

1 file changed

+4
-0
lines changed

library/unwind/src/libunwind.rs

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -249,6 +249,10 @@ if #[cfg(not(all(target_os = "ios", target_arch = "arm")))] {
249249
extern "C-unwind" {
250250
pub fn _Unwind_RaiseException(exception: *mut _Unwind_Exception) -> _Unwind_Reason_Code;
251251
}
252+
#[cfg_attr(
253+
all(feature = "llvm-libunwind", any(target_os = "fuchsia", target_os = "linux")),
254+
link(name = "unwind", kind = "static", modifiers = "-bundle")
255+
)]
252256
extern "C" {
253257
pub fn _Unwind_Backtrace(trace: _Unwind_Trace_Fn,
254258
trace_argument: *mut c_void)

0 commit comments

Comments
 (0)