From 77e86700ac0f9852111546cca5419b185c8dc6cb Mon Sep 17 00:00:00 2001 From: Arjun Ramesh Date: Mon, 29 Jul 2024 13:20:42 -0400 Subject: [PATCH] Update bootstrap to use patched cc crate for wasm32-wali-linux-musl --- src/bootstrap/Cargo.toml | 2 +- src/bootstrap/src/core/build_steps/llvm.rs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/bootstrap/Cargo.toml b/src/bootstrap/Cargo.toml index c7a513d08908a..2ec0de4348079 100644 --- a/src/bootstrap/Cargo.toml +++ b/src/bootstrap/Cargo.toml @@ -36,7 +36,7 @@ test = false # Most of the time updating these dependencies requires modifications # to the bootstrap codebase; otherwise, some targets will fail. That's # why these dependencies are explicitly pinned. -cc = "=1.0.73" +cc = "1.0.73" cmake = "=0.1.48" build_helper = { path = "../tools/build_helper" } diff --git a/src/bootstrap/src/core/build_steps/llvm.rs b/src/bootstrap/src/core/build_steps/llvm.rs index d4473e240399f..2a6e5d85cc798 100644 --- a/src/bootstrap/src/core/build_steps/llvm.rs +++ b/src/bootstrap/src/core/build_steps/llvm.rs @@ -1374,7 +1374,7 @@ impl Step for Libunwind { if file.is_file() && file.extension() == Some(OsStr::new("o")) { // file name starts with "Unwind-EHABI", "Unwind-seh" or "libunwind" let file_name = file.file_name().unwrap().to_str().expect("UTF-8 file name"); - if cpp_sources.iter().any(|f| file_name.starts_with(&f[..f.len() - 4])) { + if cpp_sources.iter().any(|f| file_name.contains(&f[..f.len() - 4])) { cc_cfg.object(&file); count += 1; }