[pedump] Have the assembly search hook look at the same directory of the assembly...

Unfortunately using mono_set_assemblies_path is not much of an option as it disables the MONO_PATH env var
and that's needed when working with an in-tree pedump - cuz having to `make install` all the time is BS.

diff --git a/tools/pedump/pedump.c b/tools/pedump/pedump.c
index 722d42f9828ab161d75a8d757594b4ae090f7bf1..b75a8fed5bed87dc07e631fadb9fac3063039a14 100644 (file)
--- a/tools/pedump/pedump.c
+++ b/tools/pedump/pedump.c
@@ -42,6 +42,8 @@ gboolean verify_metadata = FALSE;
 gboolean verify_code = FALSE;
 gboolean verify_partial_md = FALSE;
 
+static char *assembly_directory[2];
+
 static MonoAssembly *pedump_preload (MonoAssemblyName *aname, gchar **assemblies_path, gpointer user_data);
 static void pedump_assembly_load_hook (MonoAssembly *assembly, gpointer user_data);
 static MonoAssembly *pedump_assembly_search_hook (MonoAssemblyName *aname, gpointer user_data);
@@ -635,6 +637,8 @@ pedump_preload (MonoAssemblyName *aname,
        if (assemblies_path && assemblies_path [0] != NULL) {
                result = real_load (assemblies_path, aname->culture, aname->name, refonly);
        }
+       if (!result)
+               result = real_load (assembly_directory, aname->culture, aname->name, refonly);
 
        return result;
 }
@@ -707,6 +711,8 @@ main (int argc, char *argv [])
        //We have to force the runtime to load the corlib under verification as its own corlib so core types are properly populated in mono_defaults.
        if (strstr (file, "mscorlib.dll"))
                g_setenv ("MONO_PATH", g_path_get_dirname (file), 1);
+       assembly_directory [0] = g_path_get_dirname (file);
+       assembly_directory [1] = NULL;
 
 #ifndef DISABLE_PERFCOUNTERS
        mono_perfcounters_init ();