[NaCl Addin] Fix building of libraries in MSVS

visual_studio/NativeClientVSAddIn/NaCl.Build.CPPTasks/NaClCompile.cs

-
+// Copyright (c) 2012 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
 using System;
 using System.Collections.Generic;
 using System.Text;
 using System.Collections;
 using System.IO;
 using System.Reflection;
 using System.Resources;
 using System.Windows.Forms;
 using Microsoft.Build.Framework;
 using Microsoft.Win32;
@@ skipping 17 matching lines @@
         [Required]
         public bool OutputCommandLine { get; set; }
 
         [Required]
         public string Platform { get; set; }
 
         public int ProcessorNumber { get; set; }
 
         public bool MultiProcessorCompilation { get; set; }
 
+        [Required]
+        public string ConfigurationType { get; set; }
+
         [Obsolete]
         protected override StringDictionary EnvironmentOverride
         {
             get {
                 string show = OutputCommandLine ? "1" : "0";
                 string cores = Convert.ToString(ProcessorNumber);
                 return new StringDictionary() {
                       {"NACL_GCC_CORES", cores},
                       {"NACL_GCC_SHOW_COMMANDS", show }
                 };
@@ skipping 172 matching lines @@
                 }
             }
         }
 
         protected string GenerateCommandLineFromProps(ITaskItem sourceFile, bool fullOutputName=false)
         {
             StringBuilder commandLine = new StringBuilder(GCCUtilities.s_CommandLineLength);
 
             if (sourceFile != null)
             {
+                //build command line from components and add required switches
+                string props = xamlParser.Parse(sourceFile, fullOutputName);
+                commandLine.Append(props);
+                commandLine.Append(" -c ");
+
                 // Remove rtti items as they are not relevant in C compilation and will produce warnings

[binji, 2012/11/08 19:13:06]

nit: wrap at 100

                 if (SourceIsC(sourceFile.ToString()))
                 {
                     commandLine.Replace("-fno-rtti", "");
                     commandLine.Replace("-frtti", "");
                 }
 
-                //build command line from components and add required switches
-                string props = xamlParser.Parse(sourceFile, fullOutputName);
-                commandLine.Append(props);
-                commandLine.Append(" -c ");
+                if (ConfigurationType == "DynamicLibrary")
+                {
+                    commandLine.Append(" -fPIC ");
+                }
             }
 
             return commandLine.ToString();
         }
 
         protected ITaskItem[] MergeOutOfDateSources(ITaskItem[] outOfDateSourcesFromTracking, List<ITaskItem> outOfDateSourcesFromCommandLineChanges)
         {
             List<ITaskItem> mergedSources = new List<ITaskItem>(outOfDateSourcesFromTracking);
 
             foreach (ITaskItem item in outOfDateSourcesFromCommandLineChanges)
@@ skipping 57 matching lines @@
         }
 
         private int CompileSerial(string pathToTool)
         {
             int returnCode = 0;
             foreach (ITaskItem sourceItem in CompileSourceList)
             {
                 try
                 {
                     string commandLine = GenerateCommandLineFromProps(sourceItem, true);
-                    commandLine += "\"" + GCCUtilities.ConvertPathWindowsToPosix(sourceItem.ToString()) + "\"";
+                    commandLine += GCCUtilities.ConvertPathWindowsToPosix(sourceItem.ToString());
 
                     if (OutputCommandLine)
                     {
                         string logMessage = pathToTool + " " + commandLine;
                         Log.LogMessage(logMessage);
                     }
                     else
                     {
                         base.Log.LogMessage(Path.GetFileName(sourceItem.ToString()));
                     }
@@ skipping 40 matching lines @@
             pythonScript = Path.Combine(pythonScript, "compiler_wrapper.py");
 
             foreach (KeyValuePair<string, List<ITaskItem>> entry in srcGroups)
             {
                 string commandLine = entry.Key;
                 string cmd = "\"" + pathToTool + "\" " + commandLine + "--";
                 List<ITaskItem> sources = entry.Value;
 
                 foreach (ITaskItem sourceItem in sources)
                 {
-                    string src = GCCUtilities.ConvertPathWindowsToPosix(sourceItem.ToString());
-                    cmd += " \"" + src + "\"";
+                    cmd += GCCUtilities.ConvertPathWindowsToPosix(sourceItem.ToString());
                 }
 
                 try
                 {
                     // compile this group of sources
                     returnCode = base.ExecuteTool("python", cmd, "\"" + pythonScript + "\"");
                 }
                 catch (Exception e)
                 {
                     Log.LogMessage("compiler exception: {0}", e);
@@ skipping 147 matching lines @@
         protected override string ToolName
         {
             get
             {
                 return NaCLCompilerPath;
             }
         }
 
     }
 }