From e4cf717b1d448c2118c55093e83d6de027ba4af9 Mon Sep 17 00:00:00 2001 From: Rolf Bjarne Kvinge Date: Tue, 24 Jan 2017 20:12:48 +0100 Subject: [PATCH] [mtouch] Simplify linker code slightly by passing fewer arguments around. --- tools/mtouch/Target.cs | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/tools/mtouch/Target.cs b/tools/mtouch/Target.cs index 4d63984eb9..68d957c559 100644 --- a/tools/mtouch/Target.cs +++ b/tools/mtouch/Target.cs @@ -478,10 +478,10 @@ namespace Xamarin.Bundler return new Assembly (this, assembly); } - public void LinkAssemblies (string main, out List assemblies, string output_dir, out MonoTouchLinkContext link_context) + public void LinkAssemblies (out List assemblies, string output_dir) { if (Driver.Verbosity > 0) - Console.WriteLine ("Linking {0} into {1} using mode '{2}'", main, output_dir, App.LinkMode); + Console.WriteLine ("Linking {0} into {1} using mode '{2}'", App.RootAssembly, output_dir, App.LinkMode); var cache = Resolver.ToResolverCache (); var resolver = cache != null @@ -492,7 +492,7 @@ namespace Xamarin.Bundler resolver.AddSearchDirectory (Resolver.FrameworkDirectory); LinkerOptions = new LinkerOptions { - MainAssembly = Resolver.Load (main), + MainAssembly = Resolver.Load (App.RootAssembly), OutputDirectory = output_dir, LinkMode = App.LinkMode, Resolver = resolver, @@ -514,7 +514,7 @@ namespace Xamarin.Bundler Target = this, }; - MonoTouch.Tuner.Linker.Process (LinkerOptions, out link_context, out assemblies); + MonoTouch.Tuner.Linker.Process (LinkerOptions, out LinkContext, out assemblies); Driver.Watch ("Link Assemblies", 1); } @@ -605,7 +605,7 @@ namespace Xamarin.Bundler List linked_assemblies_definitions; - LinkAssemblies (App.RootAssembly, out linked_assemblies_definitions, PreBuildDirectory, out LinkContext); + LinkAssemblies (out linked_assemblies_definitions, PreBuildDirectory); // Update (add/remove) the assemblies, since the linker may have both added and removed assemblies. Assemblies.Update (this, linked_assemblies_definitions);