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 119aeab8274587548bd04288b0b7442534765c95..8c69b04c639bf09b818615e4c00747faa63d1bb1 100644 (file)
--- 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;