Remove UseSGen and 64bit toggles. We always use sgen and 32bit will be deprecated soon

1 files changed, 3 insertions, 19 deletions

diff --git a/main/build/MacOSX/monostub.mm b/main/build/MacOSX/monostub.mm
index 0843080d95..6540b8ac8f 100644
--- a/main/build/MacOSX/monostub.mm
+++ b/main/build/MacOSX/monostub.mm
@@ -251,24 +251,11 @@ int main (int argc, char **argv)
 	// can be overridden with plist string MonoMinVersion
 	NSString *req_mono_version = @"5.18.1.24";
 
-	// can be overridden with either plist bool MonoUseSGen or MONODEVELOP_USE_SGEN env
-	bool use_sgen = YES;
-	bool need64Bit = false;
-
 	NSDictionary *plist = [[NSBundle mainBundle] infoDictionary];
 	if (plist) {
-		NSNumber *sgen_obj = (NSNumber *) [plist objectForKey:@"MonoUseSGen"];
-		if (sgen_obj)
-			use_sgen = [sgen_obj boolValue];
-
 		NSString *version_obj = [plist objectForKey:@"MonoMinVersion"];
 		if (version_obj && [version_obj length] > 0)
 			req_mono_version = version_obj;
-
-		NSNumber *need_64bit_obj = (NSNumber *) [plist objectForKey:@"Mono64Bit"];
-		if (need_64bit_obj) {
-			need64Bit = [need_64bit_obj boolValue];
-		}
 	}
 
 	setenv ("MONO_GC_PARAMS", "major=marksweep-conc,nursery-size=8m", 0);
@@ -280,7 +267,7 @@ int main (int argc, char **argv)
 	setenv ("MONO_THREADS_SUSPEND", "preemptive", 0);
 
 
-	if (update_environment ([[appDir stringByAppendingPathComponent:@"Contents"] UTF8String], need64Bit)) {
+	if (update_environment ([[appDir stringByAppendingPathComponent:@"Contents"] UTF8String])) {
 		//printf ("Updated the environment.\n");
 		[pool drain];
 
@@ -299,13 +286,10 @@ int main (int argc, char **argv)
 	NSString *exeName = [NSString stringWithFormat:@"%@.exe", entryExecutableName];
 	NSString *exePath = [[appDir stringByAppendingPathComponent: binDir] stringByAppendingPathComponent: exeName];
 
-	// allow the MONODEVELOP_USE_SGEN environment variable to override the plist value
-	use_sgen = env2bool ("MONODEVELOP_USE_SGEN", use_sgen);
-
-	void *libmono = dlopen (use_sgen ? MONO_LIB_PATH ("libmonosgen-2.0.dylib") : MONO_LIB_PATH ("libmono-2.0.dylib"), RTLD_LAZY);
+	void *libmono = dlopen (MONO_LIB_PATH ("libmonosgen-2.0.dylib"), RTLD_LAZY);
 
 	if (libmono == NULL) {
-		fprintf (stderr, "Failed to load libmono%s-2.0.dylib: %s\n", use_sgen ? "sgen" : "", dlerror ());
+		fprintf (stderr, "Failed to load libmonosgen-2.0.dylib: %s\n", dlerror ());
 		NSString *msg = [NSString stringWithFormat:@"This application requires Mono %@ or newer.", req_mono_version];
 		exit_with_message (msg, entryExecutableName);
 	}