mii/wasmer
1
0
Fork 0
mirror of https://github.com/mii443/wasmer.git synced 2025-12-06 20:58:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

Set object_format when creating module_infos

Browse Source
This commit is contained in:
Felix Schütt
2022-12-30 11:07:33 +01:00
parent 9df3d955f3
commit cbc0775db6
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
lib/cli/src/commands/create_exe.rs
View File

@@ -201,7 +201,7 @@ impl CreateExe {
AllowMultiWasm::Allow, AllowMultiWasm::Allow,
self.debug_dir.is_some(), self.debug_dir.is_some(),
)?; )?;
get_module_infos(&tempdir, &atoms)?; get_module_infos(&tempdir, &atoms, object_format)?;
let mut entrypoint = get_entrypoint(&tempdir)?; let mut entrypoint = get_entrypoint(&tempdir)?;
create_header_files_in_dir(&tempdir, &mut entrypoint, &atoms, &self.precompiled_atom)?; create_header_files_in_dir(&tempdir, &mut entrypoint, &atoms, &self.precompiled_atom)?;
link_exe_from_dir( link_exe_from_dir(
@@ -231,7 +231,7 @@ impl CreateExe {
&self.precompiled_atom, &self.precompiled_atom,
self.debug_dir.is_some(), self.debug_dir.is_some(),
)?; )?;
get_module_infos(&tempdir, &atoms)?; get_module_infos(&tempdir, &atoms, object_format)?;
let mut entrypoint = get_entrypoint(&tempdir)?; let mut entrypoint = get_entrypoint(&tempdir)?;
create_header_files_in_dir(&tempdir, &mut entrypoint, &atoms, &self.precompiled_atom)?; create_header_files_in_dir(&tempdir, &mut entrypoint, &atoms, &self.precompiled_atom)?;
link_exe_from_dir( link_exe_from_dir(
@@ -917,6 +917,7 @@ pub(super) fn prepare_directory_from_single_wasm_file(
fn get_module_infos( fn get_module_infos(
directory: &Path, directory: &Path,
atoms: &[(String, Vec<u8>)], atoms: &[(String, Vec<u8>)],
object_format: ObjectFormat,
) -> Result<BTreeMap<String, ModuleInfo>, anyhow::Error> { ) -> Result<BTreeMap<String, ModuleInfo>, anyhow::Error> {
let mut entrypoint = let mut entrypoint =
get_entrypoint(directory).with_context(|| anyhow::anyhow!("get module infos"))?; get_entrypoint(directory).with_context(|| anyhow::anyhow!("get module infos"))?;
@@ -936,6 +937,8 @@ fn get_module_infos(
} }
} }
entrypoint.object_format = object_format;
write_entrypoint(directory, &entrypoint)?; write_entrypoint(directory, &entrypoint)?;
Ok(module_infos) Ok(module_infos)