Skip to content

Commit d9e515e

Browse files
committed
Update bootstrap to use patched cc crate for wasm32-wali-linux-musl
1 parent 0096fc0 commit d9e515e

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

src/bootstrap/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ test = false
3636
# Most of the time updating these dependencies requires modifications
3737
# to the bootstrap codebase; otherwise, some targets will fail. That's
3838
# why these dependencies are explicitly pinned.
39-
cc = "=1.0.73"
39+
cc = "1.0.73"
4040
cmake = "=0.1.48"
4141

4242
build_helper = { path = "../tools/build_helper" }

src/bootstrap/src/core/build_steps/llvm.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1374,7 +1374,7 @@ impl Step for Libunwind {
13741374
if file.is_file() && file.extension() == Some(OsStr::new("o")) {
13751375
// file name starts with "Unwind-EHABI", "Unwind-seh" or "libunwind"
13761376
let file_name = file.file_name().unwrap().to_str().expect("UTF-8 file name");
1377-
if cpp_sources.iter().any(|f| file_name.starts_with(&f[..f.len() - 4])) {
1377+
if cpp_sources.iter().any(|f| file_name.contains(&f[..f.len() - 4])) {
13781378
cc_cfg.object(&file);
13791379
count += 1;
13801380
}

0 commit comments

Comments
 (0)