Author: jbevain
Date: 2007-07-22 15:54:57 -0400 (Sun, 22 Jul 2007)
New Revision: 82449
Modified:
trunk/mcs/tools/linker/ChangeLog
trunk/mcs/tools/linker/Mono.Linker/Driver.cs
trunk/mcs/tools/linker/Mono.Linker/Pipeline.cs
Log:
2007-07-22 Jb Evain <[EMAIL PROTECTED]>
* Mono.Linker/Driver.cs
Mono.Linker/Pipeline.cs:
Adjust the visibility only once, even with multiple -i.
Modified: trunk/mcs/tools/linker/ChangeLog
===================================================================
--- trunk/mcs/tools/linker/ChangeLog 2007-07-22 19:51:01 UTC (rev 82448)
+++ trunk/mcs/tools/linker/ChangeLog 2007-07-22 19:54:57 UTC (rev 82449)
@@ -1,3 +1,9 @@
+2007-07-22 Jb Evain <[EMAIL PROTECTED]>
+
+ * Mono.Linker/Driver.cs
+ Mono.Linker/Pipeline.cs:
+ Adjust the visibility only once, even with multiple -i.
+
2007-07-21 Jb Evain <[EMAIL PROTECTED]>
* Mono.Linker.Steps/SweepStep.cs:
Modified: trunk/mcs/tools/linker/Mono.Linker/Driver.cs
===================================================================
--- trunk/mcs/tools/linker/Mono.Linker/Driver.cs 2007-07-22 19:51:01 UTC
(rev 82448)
+++ trunk/mcs/tools/linker/Mono.Linker/Driver.cs 2007-07-22 19:54:57 UTC
(rev 82449)
@@ -131,7 +131,10 @@
case 'i':
foreach (string file in GetFiles
(GetParam ()))
p.PrependStep (new
ResolveFromApiInfoStep (new XPathDocument (file)));
- p.AddStepBefore (typeof (OutputStep),
new AdjustVisibilityStep ());
+
+ if (!p.ContainsStep (typeof
(AdjustApiStep)))
+ p.AddStepBefore (typeof
(OutputStep), new AdjustApiStep ());
+
resolver = true;
break;
case 'l':
Modified: trunk/mcs/tools/linker/Mono.Linker/Pipeline.cs
===================================================================
--- trunk/mcs/tools/linker/Mono.Linker/Pipeline.cs 2007-07-22 19:51:01 UTC
(rev 82448)
+++ trunk/mcs/tools/linker/Mono.Linker/Pipeline.cs 2007-07-22 19:54:57 UTC
(rev 82449)
@@ -88,5 +88,14 @@
{
return (IStep []) _steps.ToArray (typeof (IStep));
}
+
+ public bool ContainsStep (Type type)
+ {
+ foreach (IStep step in _steps)
+ if (step.GetType () == type)
+ return true;
+
+ return false;
+ }
}
}
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches