diff options
| -rw-r--r-- | Makefile | 5 | ||||
| -rw-r--r-- | main/Makefile.am | 10 | ||||
| -rw-r--r-- | main/src/addins/MacPlatform/MacPlatform.cs | 3 |
3 files changed, 17 insertions, 1 deletions
@@ -100,6 +100,9 @@ aot: run: cd main && $(MAKE) run +run-64: + cd main && $(MAKE) run-64 + run-boehm: cd main && $(MAKE) run-boehm @@ -109,6 +112,8 @@ run-sgen: run-gdb: cd main && $(MAKE) run-gdb +run-gdb-64: + cd main && (MAKE) run-gdb-64 test: cd main && $(MAKE) test assembly=$(assembly) diff --git a/main/Makefile.am b/main/Makefile.am index f075ee815b..b1460ef5d5 100644 --- a/main/Makefile.am +++ b/main/Makefile.am @@ -116,10 +116,12 @@ endif run-bundle: $(PROGRAM) $(MD_LAUNCH_SETUP) $(MD_LAUNCH_EXTRA_ENV) $(MD_BIN_PATH)/MonoDevelop --no-redirect +run-64: run-sgen-64 run-boehm: runmd run-sgen: runmd-sgen +run-sgen-64: runmd-sgen-64 runmd: $(PROGRAM) $(MD_LAUNCH) --debug $(MD_BIN_PATH)/MonoDevelop.exe --no-redirect @@ -127,6 +129,9 @@ runmd: $(PROGRAM) runmd-sgen: $(PROGRAM) $(MD_LAUNCH)-sgen --debug $(MD_BIN_PATH)/MonoDevelop.exe --no-redirect +runmd-sgen-64: $(PROGRAM) + $(MD_LAUNCH)-sgen64 --debug $(MD_BIN_PATH)/MonoDevelop.exe --no-redirect + run-debug: $(PROGRAM) MONODEVELOP_CONSOLE_LOG_LEVEL=All $(MD_LAUNCH) --debug=casts $(MD_BIN_PATH)/MonoDevelop.exe --no-redirect @@ -135,6 +140,11 @@ run-gdb: $(PROGRAM) $(MD_LAUNCH_SETUP) gdb $(RUNTIME) -x gdb.commands rm -f gdb.commands +run-gdb-64: $(PROGRAM) + echo "run --debug $(MD_BIN_PATH)/MonoDevelop.exe" > gdb.commands + $(MD_LAUNCH_SETUP) gdb $(RUNTIME)-64 -x gdb.commands + rm -f gdb.commands + run-gdb-sgen: $(PROGRAM) echo "run --debug $(MD_BIN_PATH)/MonoDevelop.exe" > gdb.commands $(MD_LAUNCH_SETUP) gdb $(RUNTIME)-sgen -x gdb.commands diff --git a/main/src/addins/MacPlatform/MacPlatform.cs b/main/src/addins/MacPlatform/MacPlatform.cs index 80438f2187..b765cc0a06 100644 --- a/main/src/addins/MacPlatform/MacPlatform.cs +++ b/main/src/addins/MacPlatform/MacPlatform.cs @@ -67,7 +67,8 @@ namespace MonoDevelop.MacIntegration public MacPlatformService () { - if (IntPtr.Size == 8) + string safe64 = Environment.GetEnvironmentVariable ("MONODEVELOP_64BIT_SAFE"); + if (string.IsNullOrEmpty (safe64) && IntPtr.Size == 8) throw new Exception ("Mac integration is not yet 64-bit safe"); if (initedGlobal) |