language-servers/roc
1
0
Fork 0
mirror of https://github.com/roc-lang/roc.git synced 2025-10-01 07:41:12 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

Merge branch 'trunk' into linker

Browse source
This commit is contained in:
Brendan Hansknecht 2021-09-03 19:57:32 -07:00
commit 56dc278fae
57 changed files with 3279 additions and 1149 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -66,6 +66,7 @@ pub fn build_zig_host_native(
emit_bin: &str,
zig_host_src: &str,
zig_str_path: &str,
target: &str,
) -> Output {
Command::new("zig")
.env_clear()
@ -87,6 +88,9 @@ pub fn build_zig_host_native(
"-fPIC",
"-O",
"ReleaseSafe",
// cross-compile?
"-target",
target,
])
.output()
.unwrap()
@ -99,6 +103,7 @@ pub fn build_zig_host_native(
emit_bin: &str,
zig_host_src: &str,
zig_str_path: &str,
_target: &str,
) -> Output {
use serde_json::Value;
@ -255,6 +260,18 @@ pub fn rebuild_host(target: &Triple, host_input_path: &Path) {
&emit_bin,
zig_host_src.to_str().unwrap(),
zig_str_path.to_str().unwrap(),
"native",
)
}
Architecture::X86_32(_) => {
let emit_bin = format!("-femit-bin={}", host_dest_native.to_str().unwrap());
build_zig_host_native(
&env_path,
&env_home,
&emit_bin,
zig_host_src.to_str().unwrap(),
zig_str_path.to_str().unwrap(),
"i386-linux-gnu",
)
}
_ => panic!("Unsupported architecture {:?}", target.architecture),
@ -392,6 +409,32 @@ fn link_linux(
) -> io::Result<(Child, PathBuf)> {
let architecture = format!("{}-linux-gnu", target.architecture);
// Command::new("cp")
// .args(&[input_paths[0], "/home/folkertdev/roc/wasm/host.o"])
// .output()
// .unwrap();
//
// Command::new("cp")
// .args(&[input_paths[1], "/home/folkertdev/roc/wasm/app.o"])
// .output()
// .unwrap();
if let Architecture::X86_32(_) = target.architecture {
return Ok((
Command::new("zig")
.args(&["build-exe"])
.args(input_paths)
.args(&[
"-target",
"i386-linux-musl",
"-lc",
&format!("-femit-bin={}", output_path.to_str().unwrap()),
])
.spawn()?,
output_path,
));
}
let libcrt_path = library_path(["/usr", "lib", &architecture])
.or_else(|| library_path(["/usr", "lib"]))
.or_else(|| library_path([&nixos_path()]))