Skip to content

Commit ce58f62

Browse files
committed
Match build.rs to toolchain, handle macOS non-utf8 metadata files
1 parent 58ce9d7 commit ce58f62

File tree

1 file changed

+6
-2
lines changed

1 file changed

+6
-2
lines changed

crates/rustc_codegen_spirv/build.rs

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,9 @@ use std::{env, fs, mem};
1818
/// `cargo publish`. We need to figure out a way to do this properly, but let's hardcode it for now :/
1919
//const REQUIRED_RUST_TOOLCHAIN: &str = include_str!("../../rust-toolchain.toml");
2020
const REQUIRED_RUST_TOOLCHAIN: &str = r#"[toolchain]
21-
channel = "nightly-2025-11-02"
21+
channel = "nightly-2025-11-11"
2222
components = ["rust-src", "rustc-dev", "llvm-tools"]
23-
# commit_hash = bd3ac0330018c23b111bbee176f32c377be7b319"#;
23+
# commit_hash = 2286e5d224b3413484cf4f398a9f078487e7b49d"#;
2424

2525
fn rustc_output(arg: &str) -> Result<String, Box<dyn Error>> {
2626
let rustc = env::var("RUSTC").unwrap_or_else(|_| "rustc".into());
@@ -134,6 +134,10 @@ fn generate_pqp_cg_ssa() -> Result<(), Box<dyn Error>> {
134134
}
135135

136136
let in_path = entry.path();
137+
138+
if in_path.ends_with(".DS_Store") {
139+
continue;
140+
}
137141
let out_path = out_dir.join(entry.file_name());
138142

139143
let mut src = fs::read_to_string(in_path)?;

0 commit comments

Comments
 (0)