Rollup merge of #100126 - petrochenkov:screname, r=davidtwco

[rust.git] / src / bootstrap / config.rs

diff --git a/src/bootstrap/config.rs b/src/bootstrap/config.rs
index 4325a237c69da6ec828a9fc9bedbf66ca25fc897..c4983accc68db9f7f677cf262f7f5be0cfeaea97 100644 (file)
--- a/src/bootstrap/config.rs
+++ b/src/bootstrap/config.rs
@@ -1445,7 +1445,11 @@ pub fn llvm_libunwind(&self, target: TargetSelection) -> LlvmLibunwind {
             .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 {