Auto merge of #100341 - andrewpollack:fuchsia-llvm-libunwind, r=tmandry
Use llvm-libunwind="in-tree" for Fuchsia targets With updates to Fuchsia CI's Zircon libraries #99833, we can introduce `llvm-libunwind="in-tree"` for Fuchsia targets. This PR restores functionality removed from https://github.com/rust-lang/rust/pull/93604#issuecomment-1136515651. cc `@tmandry` `@djkoloski`
This commit is contained in:
commit
e8dc8bca21
@ -1445,7 +1445,11 @@ pub fn llvm_libunwind(&self, target: TargetSelection) -> LlvmLibunwind {
|
||||
.get(&target)
|
||||
.and_then(|t| t.llvm_libunwind)
|
||||
.or(self.llvm_libunwind_default)
|
||||
.unwrap_or(LlvmLibunwind::No)
|
||||
.unwrap_or(if target.contains("fuchsia") {
|
||||
LlvmLibunwind::InTree
|
||||
} else {
|
||||
LlvmLibunwind::No
|
||||
})
|
||||
}
|
||||
|
||||
pub fn submodules(&self, rust_info: &GitInfo) -> bool {
|
||||
|
@ -53,12 +53,6 @@ In `config.toml`, add:
|
||||
```toml
|
||||
[build]
|
||||
target = ["<host_platform>", "aarch64-fuchsia", "x86_64-fuchsia"]
|
||||
|
||||
[target.x86_64-fuchsia]
|
||||
llvm-libunwind = "in-tree"
|
||||
|
||||
[target.aarch64-fuchsia]
|
||||
llvm-libunwind = "in-tree"
|
||||
```
|
||||
|
||||
Additionally, the following environment variables must be configured (for
|
||||
|
Loading…
Reference in New Issue
Block a user