Skip to content

Commit

Permalink
Update bootstrap to use patched cc crate for wasm32-wali-linux-musl
Browse files Browse the repository at this point in the history
  • Loading branch information
arjunr2 committed Jan 17, 2025
1 parent 063c517 commit 77e8670
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion src/bootstrap/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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" }
Expand Down
2 changes: 1 addition & 1 deletion src/bootstrap/src/core/build_steps/llvm.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
Expand Down

0 comments on commit 77e8670

Please sign in to comment.