* Csc.cs (AddResponseFileCommands):

* ManagedCompiler.cs (AddResponseFileCommands): 'AddModules' and
'AdditionalLibPaths' can be empty.

svn path=/trunk/mcs/; revision=125232

diff --git a/mcs/class/Microsoft.Build.Tasks/Microsoft.Build.Tasks/ChangeLog b/mcs/class/Microsoft.Build.Tasks/Microsoft.Build.Tasks/ChangeLog
index 5bf22c70a414c87cc535f79e215ec9f76f18c41c..07588425f0a34d06733c147f96ab71cbb902d68b 100644 (file)
--- a/mcs/class/Microsoft.Build.Tasks/Microsoft.Build.Tasks/ChangeLog
+++ b/mcs/class/Microsoft.Build.Tasks/Microsoft.Build.Tasks/ChangeLog
@@ -1,3 +1,9 @@
+2009-02-01  Ankit Jain  <jankit@novell.com>
+
+       * Csc.cs (AddResponseFileCommands):
+       * ManagedCompiler.cs (AddResponseFileCommands): 'AddModules' and
+       'AdditionalLibPaths' can be empty.
+
 2009-01-30  Ankit Jain  <jankit@novell.com>
 
        * Copy.cs (Execute): Use for loop instead of enumerators.

diff --git a/mcs/class/Microsoft.Build.Tasks/Microsoft.Build.Tasks/Csc.cs b/mcs/class/Microsoft.Build.Tasks/Microsoft.Build.Tasks/Csc.cs
index b0a130157ddcc7064d602c04132bdafd14c4eaa6..3fc24dda9a400cb26172227a8379628011732545 100644 (file)
--- a/mcs/class/Microsoft.Build.Tasks/Microsoft.Build.Tasks/Csc.cs
+++ b/mcs/class/Microsoft.Build.Tasks/Microsoft.Build.Tasks/Csc.cs
@@ -44,7 +44,8 @@ namespace Microsoft.Build.Tasks {
                {
                        base.AddResponseFileCommands (commandLine);
 
-                       commandLine.AppendSwitchIfNotNull ("/lib:", AdditionalLibPaths, ",");
+                       if (AdditionalLibPaths != null && AdditionalLibPaths.Length > 0)
+                               commandLine.AppendSwitchIfNotNull ("/lib:", AdditionalLibPaths, ",");
 
                        if (Bag ["AllowUnsafeBlocks"] != null)
                                if (AllowUnsafeBlocks)

diff --git a/mcs/class/Microsoft.Build.Tasks/Microsoft.Build.Tasks/ManagedCompiler.cs b/mcs/class/Microsoft.Build.Tasks/Microsoft.Build.Tasks/ManagedCompiler.cs
index 1bea8570300003a61811bb8d8f0468384ea7c3b6..cd3f66eb7773dbe37710bf17cde26044d9d7f215 100644 (file)
--- a/mcs/class/Microsoft.Build.Tasks/Microsoft.Build.Tasks/ManagedCompiler.cs
+++ b/mcs/class/Microsoft.Build.Tasks/Microsoft.Build.Tasks/ManagedCompiler.cs
@@ -54,7 +54,8 @@ namespace Microsoft.Build.Tasks {
                protected internal override void AddResponseFileCommands (
                                                 CommandLineBuilderExtension commandLine)
                {
-                       commandLine.AppendSwitchIfNotNull ("/addmodule:", AddModules, ",");
+                       if (AddModules != null && AddModules.Length > 0)
+                               commandLine.AppendSwitchIfNotNull ("/addmodule:", AddModules, ",");
                        if (Bag ["CodePage"] != null)
                                commandLine.AppendSwitchIfNotNull ("/codepage:", CodePage.ToString ());