Use marshal-ilgen stub for compatibility with updated runtime

SteveSandersonMS · Aug 15, 2022 · e1d1387 · e1d1387
1 parent ae0a6d3
commit e1d1387
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 0 deletions.
diff --git a/src/Wasi.Sdk/build/Wasi.Sdk.targets b/src/Wasi.Sdk/build/Wasi.Sdk.targets
@@ -53,6 +53,7 @@
 		<WasiNativeFileReference Include="$(WasiRuntimePackRoot)native\libmono-wasi-driver.a" />
 		<WasiNativeFileReference Include="$(WasiRuntimePackRoot)native\libmonosgen-2.0.a" />
 		<WasiNativeFileReference Include="$(WasiRuntimePackRoot)native\libmono-component-hot_reload-stub-static.a" />
+		<WasiNativeFileReference Include="$(WasiRuntimePackRoot)native\libmono-component-marshal-ilgen-stub-static.a" />
 		<WasiNativeFileReference Include="$(WasiRuntimePackRoot)native\libmono-component-diagnostics_tracing-stub-static.a" />
 		<WasiNativeFileReference Condition="'$(WaitForDebugger)' == 'true'" Include="$(WasiRuntimePackRoot)native\libmono-component-debugger-static.a" />
 		<WasiNativeFileReference Condition="'$(WaitForDebugger)' != 'true'" Include="$(WasiRuntimePackRoot)native\libmono-component-debugger-stub-static.a" />

diff --git a/src/Wasi.Sdk/native/main.c b/src/Wasi.Sdk/native/main.c
@@ -9,6 +9,9 @@ const char* dotnet_wasi_getentrypointassemblyname();
 const char* dotnet_wasi_getbundledfile(const char* name, int* out_length);
 void dotnet_wasi_registerbundledassemblies();
 
+// TODO: This should actually go in driver.c in the runtime
+void mono_marshal_ilgen_init() {}
+
 #ifdef WASI_AFTER_RUNTIME_LOADED_DECLARATIONS
 // This is supplied from the MSBuild itemgroup @(WasiAfterRuntimeLoaded)
 WASI_AFTER_RUNTIME_LOADED_DECLARATIONS