From 86f2bb434325b9d3088362c166118de39066042c Mon Sep 17 00:00:00 2001 From: Folkert de Vries Date: Tue, 2 Aug 2022 19:54:44 +0200 Subject: [PATCH] add darwin as a supported OS --- crates/compiler/roc_target/src/lib.rs | 1 + crates/compiler/test_gen/build.rs | 10 +++++++--- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/crates/compiler/roc_target/src/lib.rs b/crates/compiler/roc_target/src/lib.rs index 46ff1b0355..f64ffdba69 100644 --- a/crates/compiler/roc_target/src/lib.rs +++ b/crates/compiler/roc_target/src/lib.rs @@ -18,6 +18,7 @@ impl From for OperatingSystem { target_lexicon::OperatingSystem::Wasi => OperatingSystem::Wasi, target_lexicon::OperatingSystem::Linux => OperatingSystem::Unix, target_lexicon::OperatingSystem::MacOSX { .. } => OperatingSystem::Unix, + target_lexicon::OperatingSystem::Darwin => OperatingSystem::Unix, other => unreachable!("unsupported operating system {:?}", other), } } diff --git a/crates/compiler/test_gen/build.rs b/crates/compiler/test_gen/build.rs index 66879ab115..16d2841728 100644 --- a/crates/compiler/test_gen/build.rs +++ b/crates/compiler/test_gen/build.rs @@ -27,7 +27,7 @@ fn build_wasm_linking_test_host() { .join("wasm_linking_host_imports.zig"); let host_wasm_path = PathBuf::from("build").join("wasm_linking_test_host.wasm"); - let host_native_path = PathBuf::from("build").join("wasm_linking_test_host"); + let host_native_path = PathBuf::from("build").join("wasm_linking_test_host.exe"); let host_source: &str = host_source_path.to_str().unwrap(); let import_source: &str = import_source_path.to_str().unwrap(); @@ -53,7 +53,7 @@ fn build_wasm_linking_test_host() { &format!("-femit-bin={}", host_wasm), ]); - let host_obj_path = PathBuf::from("build").join("wasm_linking_test_host.o"); + let host_obj_path = PathBuf::from("build").join("wasm_linking_test_host.obj"); let host_obj = host_obj_path.to_str().unwrap(); run_zig(&[ "build-obj", @@ -61,7 +61,7 @@ fn build_wasm_linking_test_host() { &format!("-femit-bin={}", &host_obj), ]); - let import_obj_path = PathBuf::from("build").join("wasm_linking_host_imports.o"); + let import_obj_path = PathBuf::from("build").join("wasm_linking_host_imports.obj"); let import_obj = import_obj_path.to_str().unwrap(); run_zig(&[ "build-obj", @@ -74,6 +74,10 @@ fn build_wasm_linking_test_host() { host_obj, import_obj, &format!("-femit-bin={}", host_native), + "--subsystem", + "console", + "-lc", + //"-fcompiler-rt", ]); }