Skip to content

Commit

Permalink
Auto merge of rust-lang#100341 - andrewpollack:fuchsia-llvm-libunwind…
Browse files Browse the repository at this point in the history
…, r=tmandry

Use llvm-libunwind="in-tree" for Fuchsia targets

With updates to Fuchsia CI's Zircon libraries rust-lang#99833, we can introduce `llvm-libunwind="in-tree"` for Fuchsia targets. This PR restores functionality removed from rust-lang#93604 (comment).

cc `@tmandry` `@djkoloski`
  • Loading branch information
bors committed Aug 13, 2022
2 parents 46c59bb + 29238f4 commit e8dc8bc
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 7 deletions.
6 changes: 5 additions & 1 deletion src/bootstrap/config.rs
Original file line number Diff line number Diff line change
Expand Up @@ -1445,7 +1445,11 @@ impl Config {
.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 {
Expand Down
6 changes: 0 additions & 6 deletions src/doc/rustc/src/platform-support/fuchsia.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit e8dc8bc

Please sign in to comment.