Merge pull request #51 from spouliot/bug41083

[mtouch] Look where XS 6.1+ has installed mlaunch. Fixes part of #41083
xamarin · May 16, 2016 · 0d63ee7 · 0d63ee7
2 parents ee07bcf + 61b3006
commit 0d63ee7
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/mk/xamarin.mk b/mk/xamarin.mk
@@ -1,5 +1,5 @@
 ifdef ENABLE_XAMARIN
-NEEDED_MACCORE_VERSION := eb9c34d8752ccbc74eafe267232c4c77ba8f631f
+NEEDED_MACCORE_VERSION := 16ebbc5b4401ecdd86c60bb0ddbf3234334f63b5
 NEEDED_MACCORE_BRANCH := master
 
 MACCORE_DIRECTORY := maccore

diff --git a/tools/mtouch/mtouch.cs b/tools/mtouch/mtouch.cs
@@ -1283,7 +1283,7 @@ static int Main2 (string [] args)
 			{ "unsupported--enable-generics-in-registrar", "[Deprecated]", v => { enable_generic_nsobject = true; classic_only_arguments.Add ("--unsupported--enable-generics-in-registrar"); }, true },
 			{ "stderr=", "Redirect the standard error for the simulated application to the specified file [DEPRECATED]", v => { }, true },
 			{ "stdout=", "Redirect the standard output for the simulated application to the specified file [DEPRECATED]", v => { }, true },
-			{ "sdkroot=", "Specify the location of Apple SDKs, default to: '/Developer/'", v => sdk_root = v },
+			{ "sdkroot=", "Specify the location of Apple SDKs, default to 'xcode-select' value.", v => sdk_root = v },
 			{ "crashreporting-api-key=", "Specify the Crashlytics API key to use (which will also enable Crashlytics support). [Deprecated].", v =>
 				{
 					throw new MonoTouchException (16, true, "The option '{0}' has been deprecated.", "--crashreporting-api-key");
@@ -1519,7 +1519,7 @@ static string MlaunchPath {
 					return path;
 
 				// check inside XS
-				path = "/Applications/Xamarin Studio.app/Contents/MacOS/mlaunch";
+				path = "/Applications/Xamarin Studio.app/Contents/Resources/lib/monodevelop/AddIns/MonoDevelop.IPhone/mlaunch.app/Contents/MacOS/mlaunch";
 				if (File.Exists (path))
 					return path;