From: Alexander Kyte <alexander.kyte@xamarin.com>
Date: Wed, 1 Apr 2015 19:13:52 +0000 (-0400)
Subject: [Runtime] Disable xdebug on OSX because it does not work and prevents gdb use.
X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=commitdiff_plain;h=d6a7e425e8676a074a1655cd36af4f14e656af87;hp=-c;p=mono.git

[Runtime] Disable xdebug on OSX because it does not work and prevents gdb use.
---

d6a7e425e8676a074a1655cd36af4f14e656af87
diff --git a/mono/mini/mini-runtime.c b/mono/mini/mini-runtime.c
index 85bc03ec77c..215bbf53283 100755
--- a/mono/mini/mini-runtime.c
+++ b/mono/mini/mini-runtime.c
@@ -2987,6 +2987,7 @@ mini_init (const char *filename, const char *runtime_version)
 
 	mono_unwind_init ();
 
+#ifdef XDEBUG_ENABLED
 	if (g_getenv ("MONO_XDEBUG")) {
 		const char *xdebug_opts = g_getenv ("MONO_XDEBUG");
 		mono_xdebug_init (xdebug_opts);
@@ -2998,6 +2999,7 @@ mini_init (const char *filename, const char *runtime_version)
 		mono_dont_free_domains = TRUE;
 		mono_using_xdebug = TRUE;
 	}
+#endif
 
 #ifdef ENABLE_LLVM
 	if (mono_use_llvm) {
diff --git a/mono/mini/mini.h b/mono/mini/mini.h
index ed151380855..427b39bb679 100644
--- a/mono/mini/mini.h
+++ b/mono/mini/mini.h
@@ -2891,6 +2891,10 @@ void        mono_simd_intrinsics_init (void);
 MonoInst*   mono_emit_native_types_intrinsics (MonoCompile *cfg, MonoMethod *cmethod, MonoMethodSignature *fsig, MonoInst **args);
 MonoType*   mini_native_type_replace_type (MonoType *type) MONO_LLVM_INTERNAL;
 
+#ifdef __linux__
+#define XDEBUG_ENABLED 1
+#endif
+
 #ifdef __linux__
 /* maybe enable also for other systems? */
 #define ENABLE_JIT_MAP 1