language-servers/roc
1
0
Fork 0
mirror of https://github.com/roc-lang/roc.git synced 2025-09-28 06:14:46 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

Link wasm test binaries with libc.a

Browse source
This commit is contained in:
Brian Carroll 2021-11-17 12:54:39 +00:00
parent 4aaa6d92a1
commit 9de989c0d5
1 changed files with 6 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

10
compiler/test_gen/src/helpers/wasm.rs
View file

@ -122,7 +122,7 @@ pub fn helper_wasm<'a, T: Wasm32TestResult>(
);
// We can either generate the test platform or write an external source file, whatever works
// generate_test_platform(&mut wasm_module, arena);
generate_test_platform(&mut wasm_module, arena);
let mut module_bytes = std::vec::Vec::with_capacity(4096);
wasm_module.serialize_mut(&mut module_bytes);
@ -140,7 +140,7 @@ pub fn helper_wasm<'a, T: Wasm32TestResult>(
let tmp_dir: TempDir; // directory for normal test runs, deleted when dropped
let debug_dir: String; // persistent directory for debugging
let dirpath: &Path = if DEBUG_WASM_FILE {
let wasm_build_dir: &Path = if DEBUG_WASM_FILE {
// Directory name based on a hash of the Roc source
let mut hash_state = DefaultHasher::new();
src.hash(&mut hash_state);
@ -157,8 +157,9 @@ pub fn helper_wasm<'a, T: Wasm32TestResult>(
tmp_dir.path()
};
let final_wasm_file = dirpath.join("final.wasm");
let app_o_file = dirpath.join("app.o");
let final_wasm_file = wasm_build_dir.join("final.wasm");
let app_o_file = wasm_build_dir.join("app.o");
let libc_a_file = "../gen_wasm/lib/libc.a";
// write the module to a file so the linker can access it
std::fs::write(&app_o_file, &module_bytes).unwrap();
@ -169,6 +170,7 @@ pub fn helper_wasm<'a, T: Wasm32TestResult>(
// input files
app_o_file.to_str().unwrap(),
bitcode::BUILTINS_WASM32_OBJ_PATH,
libc_a_file,
// output
"-o",
final_wasm_file.to_str().unwrap(),