2009-02-17 Zoltan Varga <vargaz@gmail.com>

* aot-runtime.c (load_image): Pass our basedir to mono_assembly_load. svn path=/trunk/mono/; revision=127095
baulig · Feb 17, 2009 · 2e1d9a6 · 2e1d9a6
1 parent c69c682
commit 2e1d9a6
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/mono/mini/ChangeLog b/mono/mini/ChangeLog
@@ -1,5 +1,7 @@
 2009-02-17  Zoltan Varga  <vargaz@gmail.com>
 
+	* aot-runtime.c (load_image): Pass our basedir to mono_assembly_load.
+
 	* aot-compiler.c (emit_exception_debug_info): Bump the maximum size of
 	the encoding buffer.
 

diff --git a/mono/mini/aot-runtime.c b/mono/mini/aot-runtime.c
@@ -200,7 +200,7 @@ load_image (MonoAotModule *module, int index)
 	if (module->out_of_date)
 		return NULL;
 
-	assembly = mono_assembly_load (&module->image_names [index], NULL, &status);
+	assembly = mono_assembly_load (&module->image_names [index], module->assembly->basedir, &status);
 	if (!assembly) {
 		mono_trace (G_LOG_LEVEL_INFO, MONO_TRACE_AOT, "AOT module %s is unusable because dependency %s is not found.\n", module->aot_name, module->image_names [index].name);
 		module->out_of_date = TRUE;