language-servers/roc
1
0
Fork 0
mirror of https://github.com/roc-lang/roc.git synced 2025-09-26 21:39:07 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

add darwin as a supported OS

Browse source
This commit is contained in:
Folkert de Vries 2022-08-02 19:54:44 +02:00
parent 0c72bf7e1f
commit 86f2bb4343
2 changed files with 8 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

1
crates/compiler/roc_target/src/lib.rs
View file

@ -18,6 +18,7 @@ impl From<target_lexicon::OperatingSystem> for OperatingSystem {
target_lexicon::OperatingSystem::Wasi => OperatingSystem::Wasi, target_lexicon::OperatingSystem::Wasi => OperatingSystem::Wasi,
target_lexicon::OperatingSystem::Linux => OperatingSystem::Unix, target_lexicon::OperatingSystem::Linux => OperatingSystem::Unix,
target_lexicon::OperatingSystem::MacOSX { .. } => OperatingSystem::Unix, target_lexicon::OperatingSystem::MacOSX { .. } => OperatingSystem::Unix,
target_lexicon::OperatingSystem::Darwin => OperatingSystem::Unix,
other => unreachable!("unsupported operating system {:?}", other), other => unreachable!("unsupported operating system {:?}", other),
} }
} }

10
crates/compiler/test_gen/build.rs
View file

@ -27,7 +27,7 @@ fn build_wasm_linking_test_host() {
.join("wasm_linking_host_imports.zig"); .join("wasm_linking_host_imports.zig");
let host_wasm_path = PathBuf::from("build").join("wasm_linking_test_host.wasm"); 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 host_source: &str = host_source_path.to_str().unwrap();
let import_source: &str = import_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), &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(); let host_obj = host_obj_path.to_str().unwrap();
run_zig(&[ run_zig(&[
"build-obj", "build-obj",
@ -61,7 +61,7 @@ fn build_wasm_linking_test_host() {
&format!("-femit-bin={}", &host_obj), &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(); let import_obj = import_obj_path.to_str().unwrap();
run_zig(&[ run_zig(&[
"build-obj", "build-obj",
@ -74,6 +74,10 @@ fn build_wasm_linking_test_host() {
host_obj, host_obj,
import_obj, import_obj,
&format!("-femit-bin={}", host_native), &format!("-femit-bin={}", host_native),
"--subsystem",
"console",
"-lc",
//"-fcompiler-rt",
]); ]);
} }