diff options
| author | Andrew Pollack <andrewpkq@gmail.com> | 2022-08-09 17:59:10 +0000 |
|---|---|---|
| committer | Andrew Pollack <andrewpkq@gmail.com> | 2022-08-09 20:02:19 +0000 |
| commit | 29238f44a07440a907db7cbb4a4ab23ab401aa04 (patch) | |
| tree | 5c7f54ec0414c4d64b5ad5e465b07c13306b8282 | |
| parent | 6d3f1beae1720055e5a30f4dbe7a9e7fb810c65e (diff) | |
| download | rust-29238f44a07440a907db7cbb4a4ab23ab401aa04.tar.gz rust-29238f44a07440a907db7cbb4a4ab23ab401aa04.zip | |
LLVM lib unwind fuchsia config
Removing libunwind from Fuchsia target docs
| -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 |