language-servers/roc
1
0
Fork 0
mirror of https://github.com/roc-lang/roc.git synced 2025-09-29 14:54:47 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 7

start using zig9 as the name for trunk zig

Browse source
This commit is contained in:
Folkert 2021-09-06 22:25:35 +02:00
parent 3fb6736f7c
commit ea9b23cda8
2 changed files with 22 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

43
compiler/build/src/link.rs
View file

@ -606,28 +606,27 @@ fn link_wasm32(
) -> io::Result<(Child, PathBuf)> { ) -> io::Result<(Child, PathBuf)> {
let zig_str_path = find_zig_str_path(); let zig_str_path = find_zig_str_path();
let child = let child = Command::new("zig9")
Command::new("/home/folkertdev/Downloads/zig-linux-x86_64-0.9.0-dev.848+d5ef5da59/zig") // .env_clear()
// .env_clear() // .env("PATH", &env_path)
// .env("PATH", &env_path) .args(&["build-exe"])
.args(&["build-exe"]) .args(input_paths)
.args(input_paths) .args([
.args([ &format!("-femit-bin={}", output_path.to_str().unwrap()),
&format!("-femit-bin={}", output_path.to_str().unwrap()), // include libc
// include libc "-lc",
"-lc", "-target",
"-target", "wasm32-wasi-musl",
"wasm32-wasi-musl", "--pkg-begin",
"--pkg-begin", "str",
"str", zig_str_path.to_str().unwrap(),
zig_str_path.to_str().unwrap(), "--pkg-end",
"--pkg-end", "--strip",
"--strip", // "-O", "ReleaseSmall",
// "-O", "ReleaseSmall", // useful for debugging
// useful for debugging // "-femit-llvm-ir=/home/folkertdev/roc/roc/examples/benchmarks/platform/host.ll",
// "-femit-llvm-ir=/home/folkertdev/roc/roc/examples/benchmarks/platform/host.ll", ])
]) .spawn()?;
.spawn()?;
Ok((child, output_path)) Ok((child, output_path))
} }

2
compiler/test_gen/src/helpers/eval.rs
View file

@ -366,7 +366,7 @@ pub fn helper_wasm<'a>(
use std::process::Command; use std::process::Command;
Command::new("/home/folkertdev/Downloads/zig-linux-x86_64-0.9.0-dev.848+d5ef5da59/zig") Command::new("zig9")
.current_dir(dir_path) .current_dir(dir_path)
.args(&[ .args(&[
"wasm-ld", "wasm-ld",