Merge branch 'master' of github.com:mono/mono into masterwork

[mono.git] / mono / mini / mini.c

diff --git a/mono/mini/mini.c b/mono/mini/mini.c
index ab0583b9387fd146c5198eb86c7010f00ca379d3..3b5a7c3196e04ff872b54902d8b2c1c907bb6bb8 100644 (file)
--- a/mono/mini/mini.c
+++ b/mono/mini/mini.c
@@ -5926,6 +5926,9 @@ mini_init (const char *filename, const char *runtime_version)
 #endif
 
        mono_install_callbacks (&callbacks);
+
+       if (getenv ("MONO_DEBUG") != NULL)
+               mini_parse_debug_options ();
        
        mono_arch_cpu_init ();
 
@@ -5935,9 +5938,6 @@ mini_init (const char *filename, const char *runtime_version)
 
        mini_gc_init ();
 
-       if (getenv ("MONO_DEBUG") != NULL)
-               mini_parse_debug_options ();
-
        if (getenv ("MONO_XDEBUG")) {
                char *xdebug_opts = getenv ("MONO_XDEBUG");
                mono_xdebug_init (xdebug_opts);