Skip to content

Commit e8dc8bc

Browse files
committed
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 #93604 (comment). cc `@tmandry` `@djkoloski`
2 parents 46c59bb + 29238f4 commit e8dc8bc

File tree

2 files changed

+5
-7
lines changed

2 files changed

+5
-7
lines changed

Diff for: src/bootstrap/config.rs

+5-1
Original file line numberDiff line numberDiff line change
@@ -1445,7 +1445,11 @@ impl Config {
14451445
.get(&target)
14461446
.and_then(|t| t.llvm_libunwind)
14471447
.or(self.llvm_libunwind_default)
1448-
.unwrap_or(LlvmLibunwind::No)
1448+
.unwrap_or(if target.contains("fuchsia") {
1449+
LlvmLibunwind::InTree
1450+
} else {
1451+
LlvmLibunwind::No
1452+
})
14491453
}
14501454

14511455
pub fn submodules(&self, rust_info: &GitInfo) -> bool {

Diff for: src/doc/rustc/src/platform-support/fuchsia.md

-6
Original file line numberDiff line numberDiff line change
@@ -53,12 +53,6 @@ In `config.toml`, add:
5353
```toml
5454
[build]
5555
target = ["<host_platform>", "aarch64-fuchsia", "x86_64-fuchsia"]
56-
57-
[target.x86_64-fuchsia]
58-
llvm-libunwind = "in-tree"
59-
60-
[target.aarch64-fuchsia]
61-
llvm-libunwind = "in-tree"
6256
```
6357

6458
Additionally, the following environment variables must be configured (for

0 commit comments

Comments
 (0)