Get rid of 64bit toggle from mac config

6 files changed, 8 insertions, 37 deletions

diff --git a/main/Makefile.am b/main/Makefile.am
index 9993eb3095..101ecc3053 100644
--- a/main/Makefile.am
+++ b/main/Makefile.am
@@ -83,8 +83,6 @@ run-leaks: $(PROGRAM)
 run-no-accessibility: $(PROGRAM)
 	DISABLE_ATKCOCOA=yes LANG= LC_ALL= $(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
diff --git a/main/build/MacOSX/Makefile.am b/main/build/MacOSX/Makefile.am
index d5376015c1..4757765aa1 100644
--- a/main/build/MacOSX/Makefile.am
+++ b/main/build/MacOSX/Makefile.am
@@ -49,23 +49,23 @@ dmg: render.exe app
 	./make-dmg-bundle.sh
 
 monostub.o: monostub.mm $(MONOSTUB_EXTRA_SOURCEFILES)
-	g++ -g $(HYBRID_SUSPEND_ABORT) -c -Wall -m$(MONOSTUB_ARCH) -o $@ monostub.mm
+	g++ -g $(HYBRID_SUSPEND_ABORT) -c -Wall -m64 -o $@ monostub.mm
 
 monostub-nogui.o: monostub.mm $(MONOSTUB_EXTRA_SOURCEFILES)
-	g++ -g $(HYBRID_SUSPEND_ABORT) -DNOGUI -c -Wall -m$(MONOSTUB_ARCH) -o $@ monostub.mm
+	g++ -g $(HYBRID_SUSPEND_ABORT) -DNOGUI -c -Wall -m64 -o $@ monostub.mm
 
 monostub: monostub.o $(MONOSTUB_STATIC_LINK)
-	clang++ -g -Wall -m$(MONOSTUB_ARCH) -o $@ -Wl,-all_load $^ -framework AppKit -framework Quartz -undefined dynamic_lookup $(MONOSTUB_RPATH)
+	clang++ -g -Wall -m64 -o $@ -Wl,-all_load $^ -framework AppKit -framework Quartz -undefined dynamic_lookup $(MONOSTUB_RPATH)
 	mkdir -p ../bin
 	cp $@ ../bin/MonoDevelop
 
 monostub-nogui: monostub-nogui.o $(MONOSTUB_STATIC_LINK)
-	clang++ -g -Wall -m$(MONOSTUB_ARCH) -o $@ -Wl,-all_load $^ -framework AppKit -framework Quartz -undefined dynamic_lookup $(MONOSTUB_RPATH)
+	clang++ -g -Wall -m64 -o $@ -Wl,-all_load $^ -framework AppKit -framework Quartz -undefined dynamic_lookup $(MONOSTUB_RPATH)
 	mkdir -p ../bin
 	cp $@ ../bin/mdtool
 
 monostub-test: monostub-test.m $(MONOSTUB_EXTRA_SOURCEFILES)
-	gcc -g -Wall -m$(MONOSTUB_ARCH) -o $@ monostub-test.m -framework AppKit
+	gcc -g -Wall -m64 -o $@ monostub-test.m -framework AppKit
 	./monostub-test
 
 clean-local:
diff --git a/main/build/MacOSX/monostub-test.m b/main/build/MacOSX/monostub-test.m
index 970c1c7267..7dfa0a7d8f 100644
--- a/main/build/MacOSX/monostub-test.m
+++ b/main/build/MacOSX/monostub-test.m
@@ -145,9 +145,6 @@ void test_update_environment(void)
 	const char *gac_components[] = {
 		[resourcePath UTF8String],
 	};
-	const char *safe_components[] = {
-		"yes",
-	};
 	const char *numeric_components[] = {
 		"C",
 	};
@@ -161,7 +158,6 @@ void test_update_environment(void)
 	check_path_has_components(getenv("PATH"), path_components, sizeof(path_components) / sizeof(char *));
 	check_path_has_components(getenv("PKG_CONFIG_PATH"), pkg_components, sizeof(pkg_components) / sizeof(char *));
 	check_path_has_components(getenv("MONO_GAC_PREFIX"), gac_components, sizeof(gac_components) / sizeof(char *));
-	check_path_has_components(getenv("MONODEVELOP_64BIT_SAFE"), safe_components, sizeof(safe_components) / sizeof (char *));
 	check_path_has_components(getenv("LC_NUMERIC"), numeric_components, sizeof(numeric_components) / sizeof(char *));
 }
 
diff --git a/main/build/MacOSX/monostub-utils.h b/main/build/MacOSX/monostub-utils.h
index 309d982ffe..f9b7da42ce 100644
--- a/main/build/MacOSX/monostub-utils.h
+++ b/main/build/MacOSX/monostub-utils.h
@@ -188,9 +188,6 @@ update_environment (NSString *binDir)
 	if (push_env_to_end ("PATH", "~/.dotnet/tools"))
 		updated = YES;
 
-	if (replace_env ("MONODEVELOP_64BIT_SAFE", "yes"))
-		updated = YES;
-
 	if (replace_env ("LC_NUMERIC", "C"))
 		updated = YES;
 
diff --git a/main/configure.ac b/main/configure.ac
index 79db5ef0e6..a678942019 100644
--- a/main/configure.ac
+++ b/main/configure.ac
@@ -6,8 +6,6 @@ AM_MAINTAINER_MODE
 #capture aclocal flags for autoreconf
 AC_SUBST(ACLOCAL_FLAGS)
 
-default_macarch=i386
-
 dnl Add MD's mimetypes to mime and desktop databases
 AC_ARG_ENABLE(update-mimedb,
    AC_HELP_STRING([--disable-update-mimedb],
@@ -61,29 +59,11 @@ AC_ARG_ENABLE(macplatform,
 		enable_macplatform=${enableval}, enable_macplatform=$default_macplatform)
 
 if test x$enable_macplatform = xyes; then
-	platform_bindings="${platform_bindings}Mac ${with_macarch}"
+	platform_bindings="${platform_bindings}Mac"
 fi
 
 AM_CONDITIONAL(ENABLE_MACPLATFORM, [test x$enable_macplatform = xyes])
 
-# What architecture for Mac
-AC_ARG_WITH(macarch,
-	AC_HELP_STRING([--with-macarch],
-		[which architecture for mac: i386, x86_64 [default=i386]]),
-	with_macarch=${withval}, with_macarch=$default_macarch)
-
-SGEN_SUFFIX=
-MONOSTUB_ARCH=32
-if test x$with_macarch = xx86_64; then
-	SGEN_SUFFIX=64
-	MONOSTUB_ARCH=64
-fi
-AC_SUBST(SGEN_SUFFIX)
-AC_SUBST(MONOSTUB_ARCH)
-
-MAC_ARCHITECTURE=${with_macarch}
-AC_SUBST(MAC_ARCHITECTURE)
-
 # Windows platform addin
 AC_ARG_ENABLE(windowsplatform,
 	AC_HELP_STRING([--enable-windowsplatform],
diff --git a/main/external/Makefile.am b/main/external/Makefile.am
index b6e31036ad..dabe5559f4 100644
--- a/main/external/Makefile.am
+++ b/main/external/Makefile.am
@@ -1,11 +1,11 @@
 XAMMAC_PATH=/Library/Frameworks/Xamarin.Mac.framework/Versions/Current
 XAMMAC_LIB_PATH=$(XAMMAC_PATH)/lib
-XAMMAC_PDB=$(XAMMAC_LIB_PATH)/@MAC_ARCHITECTURE@/full/Xamarin.Mac.pdb
+XAMMAC_PDB=$(XAMMAC_LIB_PATH)/x86_64/full/Xamarin.Mac.pdb
 
 if ENABLE_MACPLATFORM
 all: Xamarin.Mac.dll Xamarin.Mac.registrar.full.a libxammac.dylib Xamarin.Mac.buildinfo
 
-Xamarin.Mac.dll: $(XAMMAC_LIB_PATH)/@MAC_ARCHITECTURE@/full/Xamarin.Mac.dll
+Xamarin.Mac.dll: $(XAMMAC_LIB_PATH)/x86_64/full/Xamarin.Mac.dll
 	cp $< $@
 	if [[ -f $<.mdb ]]; then cp $<.mdb $@.mdb; fi;
 	if [[ -f $(XAMMAC_PDB) ]]; then cp $(XAMMAC_PDB) Xamarin.Mac.pdb; fi;