language-servers/roc
1
0
Fork 0
mirror of https://github.com/roc-lang/roc.git synced 2025-10-03 08:34:33 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

expand zig nix workaround and update issue number

Browse source
This commit is contained in:
Brendan Hansknecht 2024-12-11 21:31:56 -08:00
parent 7b39066593
commit 3790ddf743
No known key found for this signature in database
GPG key ID: 0EA784685083E75B
3 changed files with 8 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

2
crates/compiler/build/src/link.rs
View file

@ -1351,7 +1351,7 @@ fn run_build_command(mut command: Command, file_to_build: &str, flaky_fail_count
if !cmd_output.status.success() { if !cmd_output.status.success() {
match std::str::from_utf8(&cmd_output.stderr) { match std::str::from_utf8(&cmd_output.stderr) {
Ok(stderr) => { Ok(stderr) => {
// flaky error seen on macos 12 apple silicon, related to https://github.com/ziglang/zig/issues/9711 // flaky error seen on macos 12 apple silicon, related to https://github.com/ziglang/zig/issues/20501
if stderr.contains("unable to save cached ZIR code") { if stderr.contains("unable to save cached ZIR code") {
if flaky_fail_counter < max_flaky_fail_count { if flaky_fail_counter < max_flaky_fail_count {
run_build_command(command, file_to_build, flaky_fail_counter + 1) run_build_command(command, file_to_build, flaky_fail_counter + 1)

4
crates/compiler/builtins/bitcode/bc/build.rs
View file

@ -19,7 +19,7 @@ fn main() {
// dunce can be removed once ziglang/zig#5109 is fixed // dunce can be removed once ziglang/zig#5109 is fixed
let bitcode_path = dunce::canonicalize(Path::new(".")).unwrap().join(".."); let bitcode_path = dunce::canonicalize(Path::new(".")).unwrap().join("..");
// workaround for github.com/ziglang/zig/issues/9711 // workaround for github.com/ziglang/zig/issues/20501
#[cfg(target_os = "macos")] #[cfg(target_os = "macos")]
let zig_cache_dir = tempdir().expect("Failed to create temp directory for zig cache"); let zig_cache_dir = tempdir().expect("Failed to create temp directory for zig cache");
#[cfg(target_os = "macos")] #[cfg(target_os = "macos")]
@ -69,7 +69,7 @@ fn generate_bc_file(bitcode_path: &Path, zig_object: &str, file_name: &str) {
let dest_bc_64bit = bc_path.to_str().expect("Invalid dest bc path"); let dest_bc_64bit = bc_path.to_str().expect("Invalid dest bc path");
println!("Compiling 64-bit bitcode to: {dest_bc_64bit}"); println!("Compiling 64-bit bitcode to: {dest_bc_64bit}");
// workaround for github.com/ziglang/zig/issues/9711 // workaround for github.com/ziglang/zig/issues/20501
#[cfg(target_os = "macos")] #[cfg(target_os = "macos")]
let _ = fs::remove_dir_all("./.zig-cache"); let _ = fs::remove_dir_all("./.zig-cache");

6
crates/compiler/builtins/bitcode/build.rs
View file

@ -19,7 +19,7 @@ fn main() {
// dunce can be removed once ziglang/zig#5109 is fixed // dunce can be removed once ziglang/zig#5109 is fixed
let bitcode_path = dunce::canonicalize(Path::new(".")).unwrap(); let bitcode_path = dunce::canonicalize(Path::new(".")).unwrap();
// workaround for github.com/ziglang/zig/issues/9711 // workaround for github.com/ziglang/zig/issues/20501
#[cfg(target_os = "macos")] #[cfg(target_os = "macos")]
let zig_cache_dir = tempdir().expect("Failed to create temp directory for zig cache"); let zig_cache_dir = tempdir().expect("Failed to create temp directory for zig cache");
#[cfg(target_os = "macos")] #[cfg(target_os = "macos")]
@ -70,6 +70,10 @@ fn generate_object_file(bitcode_path: &Path, zig_object: &str, object_file_name:
println!("Compiling zig object `{zig_object}` to: {src_obj}"); println!("Compiling zig object `{zig_object}` to: {src_obj}");
// workaround for github.com/ziglang/zig/issues/20501
#[cfg(target_os = "macos")]
let _ = fs::remove_dir_all("./.zig-cache");
let mut zig_cmd = zig(); let mut zig_cmd = zig();
zig_cmd zig_cmd