From: Zoltan Varga <vargaz@gmail.com>
Date: Fri, 19 Nov 2010 16:07:43 +0000 (+0100)
Subject: Load dependent assemblies of an aot image from the assembly's basedir. Fixes #654850.
X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=commitdiff_plain;h=5d9a8ac05db431d4d96b5f24a21668313da5bc6d;p=mono.git

Load dependent assemblies of an aot image from the assembly's basedir. Fixes #654850.
---

diff --git a/mono/mini/aot-runtime.c b/mono/mini/aot-runtime.c
index 119aeab8274..8c69b04c639 100644
--- a/mono/mini/aot-runtime.c
+++ b/mono/mini/aot-runtime.c
@@ -195,7 +195,7 @@ load_image (MonoAotModule *amodule, int index, gboolean set_error)
 	if (amodule->out_of_date)
 		return NULL;
 
-	assembly = mono_assembly_load (&amodule->image_names [index], NULL, &status);
+	assembly = mono_assembly_load (&amodule->image_names [index], amodule->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", amodule->aot_name, amodule->image_names [index].name);
 		amodule->out_of_date = TRUE;