Index: mono/mini/Makefile.am
===================================================================
--- mono/mini/Makefile.am	(revision 78083)
+++ mono/mini/Makefile.am	(working copy)
@@ -244,9 +244,13 @@
 if ALPHA
 mono_debugger_arch_sources = mdb-debug-info64.s
 else
+if PLATFORM_DARWIN
+mono_debugger_arch_sources = 
+else
 mono_debugger_arch_sources = mdb-debug-info32.s
 endif
 endif
+endif
 mono_debugger_sources = debug-debugger.c debug-debugger.h $(mono_debugger_arch_sources)
 else
 mono_debugger_sources =
Index: mono/mini/driver.c
===================================================================
--- mono/mini/driver.c	(revision 78083)
+++ mono/mini/driver.c	(working copy)
@@ -906,18 +906,20 @@
 		opt &= ~MONO_OPT_COPYPROP;
 		opt &= ~MONO_OPT_CONSPROP;
 		enable_debugging = TRUE;
+	}
 
+	mono_set_defaults (mini_verbose, opt);
+	domain = mini_init (argv [i], forced_version);
+	
+	if (action == DO_DEBUGGER) {
 #ifdef MONO_DEBUGGER_SUPPORTED
 		mono_debug_init (MONO_DEBUG_FORMAT_DEBUGGER);
 		mono_debugger_init ();
 #else
 		g_print ("The Mono Debugger is not supported on this platform.\n");
 		return 1;
-#endif
+#endif	
 	}
-
-	mono_set_defaults (mini_verbose, opt);
-	domain = mini_init (argv [i], forced_version);
 	
 	switch (action) {
 	case DO_REGRESSION:
Index: mono/mini/debug-debugger.c
===================================================================
--- mono/mini/debug-debugger.c	(revision 78083)
+++ mono/mini/debug-debugger.c	(working copy)
@@ -331,7 +331,11 @@
 	debugger_finalize_threads ();
 }
 
+#if defined (PLATFORM_DARWIN)
+MonoDebuggerInfo * __attribute__ ((section ("__DATA,.mdb_debug_info"))) MONO_DEBUGGER__debugger_info_ptr = &MONO_DEBUGGER__debugger_info;
+#else
 extern MonoDebuggerInfo *MONO_DEBUGGER__debugger_info_ptr;
+#endif
 
 static void
 debugger_initialize (void)
Index: configure.in
===================================================================
--- configure.in	(revision 78083)
+++ configure.in	(working copy)
@@ -232,6 +232,8 @@
 		no_version_script=yes
 		libdl=
 		libgc_threads=pthreads
+		platform_darwin=yes
+		AC_DEFINE(PLATFORM_DARWIN,1,[Platform is Darwin])
 		;;
 	*)
 		AC_MSG_WARN([*** Please add $host to configure.in checks!])
@@ -246,6 +248,7 @@
 fi
 
 AM_CONDITIONAL(PLATFORM_WIN32, test x$platform_win32 = xyes)
+AM_CONDITIONAL(PLATFORM_DARWIN, test x$platform_darwin = xyes)
 
 AC_CHECK_TOOL(CC, gcc, gcc)
 AC_PROG_CC
@@ -1861,6 +1864,9 @@
 		*-*-*linux*)
 			mono_debugger_supported=yes
 			;;
+		i*86-apple-darwin*)
+			mono_debugger_supported=yes
+			;;
 		esac
 	fi
 fi