diff options
| author | bors <bors@rust-lang.org> | 2022-08-13 02:41:27 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2022-08-13 02:41:27 +0000 |
| commit | e8dc8bca2118ec1ed5970790614f0b81e9167f10 (patch) | |
| tree | ea9e310ec5aea05240f9ef8d2da1416549260634 | |
| parent | 46c59bbb79b3fa99950e2a7eaaeb161990561b8b (diff) | |
| parent | 29238f44a07440a907db7cbb4a4ab23ab401aa04 (diff) | |
| download | rust-e8dc8bca2118ec1ed5970790614f0b81e9167f10.tar.gz rust-e8dc8bca2118ec1ed5970790614f0b81e9167f10.zip | |
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`
| -rw-r--r-- | src/bootstrap/config.rs | 6 | ||||
| -rw-r--r-- | src/doc/rustc/src/platform-support/fuchsia.md | 6 |
2 files changed, 5 insertions, 7 deletions
diff --git a/src/bootstrap/config.rs b/src/bootstrap/config.rs index 4325a237c69..c4983accc68 100644 --- a/src/bootstrap/config.rs +++ b/src/bootstrap/config.rs @@ -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 { diff --git a/src/doc/rustc/src/platform-support/fuchsia.md b/src/doc/rustc/src/platform-support/fuchsia.md index 61bd1b425bc..c526e4d1fa8 100644 --- a/src/doc/rustc/src/platform-support/fuchsia.md +++ b/src/doc/rustc/src/platform-support/fuchsia.md @@ -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 |