mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Change the way libunwind is linked for *-windows-gnullvm targets

Browse Source
This commit is contained in:
Mateusz Mikuła 2022-11-01 12:22:30 +01:00
parent f42b6fa7ca
commit 68c5939722
3 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
library/unwind/src/lib.rs
View File

@ -104,7 +104,3 @@ extern "C" {}
#[cfg(all(target_vendor = "fortanix", target_env = "sgx"))] #[cfg(all(target_vendor = "fortanix", target_env = "sgx"))]
#[link(name = "unwind", kind = "static", modifiers = "-bundle")] #[link(name = "unwind", kind = "static", modifiers = "-bundle")]
extern "C" {} extern "C" {}
#[cfg(all(target_os = "windows", target_env = "gnu", target_abi = "llvm"))]
#[link(name = "unwind", kind = "static", modifiers = "-bundle")]
extern "C" {}

5
library/unwind/src/libunwind.rs
View File

@ -90,7 +90,10 @@ pub type _Unwind_Exception_Cleanup_Fn =
// rustc_codegen_ssa::src::back::symbol_export, rustc_middle::middle::exported_symbols // rustc_codegen_ssa::src::back::symbol_export, rustc_middle::middle::exported_symbols
// and RFC 2841 // and RFC 2841
#[cfg_attr( #[cfg_attr(
all(feature = "llvm-libunwind", any(target_os = "fuchsia", target_os = "linux")), any(
all(feature = "llvm-libunwind", any(target_os = "fuchsia", target_os = "linux")),
all(target_os = "windows", target_env = "gnu", target_abi = "llvm")
),
link(name = "unwind", kind = "static", modifiers = "-bundle") link(name = "unwind", kind = "static", modifiers = "-bundle")
)] )]
extern "C-unwind" { extern "C-unwind" {

1
src/bootstrap/compile.rs
View File

@ -206,7 +206,6 @@ fn copy_third_party_objects(
} }
if target == "x86_64-fortanix-unknown-sgx" if target == "x86_64-fortanix-unknown-sgx"
|| target.contains("pc-windows-gnullvm")
|| builder.config.llvm_libunwind(target) == LlvmLibunwind::InTree || builder.config.llvm_libunwind(target) == LlvmLibunwind::InTree
&& (target.contains("linux") || target.contains("fuchsia")) && (target.contains("linux") || target.contains("fuchsia"))
{ {