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

Auto merge of #100341 - andrewpollack:fuchsia-llvm-libunwind, r=tmandry

Browse Source 
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:
bors 2022-08-13 02:41:27 +00:00
commit e8dc8bca21
2 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/bootstrap/config.rs
View File

@ -1445,7 +1445,11 @@ impl Config {
.get(&target) .get(&target)
.and_then(|t| t.llvm_libunwind) .and_then(|t| t.llvm_libunwind)
.or(self.llvm_libunwind_default) .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 { pub fn submodules(&self, rust_info: &GitInfo) -> bool {

6
src/doc/rustc/src/platform-support/fuchsia.md
View File

@ -53,12 +53,6 @@ In `config.toml`, add:
```toml ```toml
[build] [build]
target = ["<host_platform>", "aarch64-fuchsia", "x86_64-fuchsia"] 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 Additionally, the following environment variables must be configured (for