Revert renaming wasm.o / wasm.obj differences

This commit is contained in:
Felix Schütt
2022-11-16 14:00:55 +01:00
parent aafd57ca9e
commit 0778ddf99f

View File

@@ -91,6 +91,9 @@ struct WasmerCreateObj {
impl Default for WasmerCreateObj { impl Default for WasmerCreateObj {
fn default() -> Self { fn default() -> Self {
#[cfg(not(windows))]
let output_object_path = PathBuf::from("wasm.o");
#[cfg(windows)]
let output_object_path = PathBuf::from("wasm.obj"); let output_object_path = PathBuf::from("wasm.obj");
Self { Self {
current_dir: std::env::current_dir().unwrap(), current_dir: std::env::current_dir().unwrap(),
@@ -268,6 +271,9 @@ fn create_obj(args: Vec<&'static str>, keyword_needle: &str, keyword: &str) -> a
let wasm_path = operating_dir.join(create_exe_test_wasm_path()); let wasm_path = operating_dir.join(create_exe_test_wasm_path());
#[cfg(not(windows))]
let object_path = operating_dir.join("wasm.o");
#[cfg(windows)]
let object_path = operating_dir.join("wasm.obj"); let object_path = operating_dir.join("wasm.obj");
let output: Vec<u8> = WasmerCreateObj { let output: Vec<u8> = WasmerCreateObj {
@@ -330,6 +336,9 @@ fn create_exe_with_object_input(args: Vec<&'static str>) -> anyhow::Result<()> {
let wasm_path = operating_dir.join(create_exe_test_wasm_path()); let wasm_path = operating_dir.join(create_exe_test_wasm_path());
#[cfg(not(windows))]
let object_path = operating_dir.join("wasm.o");
#[cfg(windows)]
let object_path = operating_dir.join("wasm.obj"); let object_path = operating_dir.join("wasm.obj");
WasmerCreateObj { WasmerCreateObj {