From 510afbddc7e464d2608aa69f9d75b4ce03e8777e Mon Sep 17 00:00:00 2001
From: Marc-Andre Laperle <malaperle@omnialabs.net>
Date: Tue, 26 Jul 2011 00:54:17 -0400
Subject: [PATCH] Bug 344009 - Eclipse CDT uses wrong command to build static
 library (crossgcc, msvc)

---
 .../org.eclipse.cdt.build.crossgcc/plugin.xml | 32 +++++++++++++++++++
 windows/org.eclipse.cdt.msw.build/plugin.xml  | 20 ++++++++++--
 2 files changed, 50 insertions(+), 2 deletions(-)
 mode change 100755 => 100644 cross/org.eclipse.cdt.build.crossgcc/plugin.xml

diff --git a/cross/org.eclipse.cdt.build.crossgcc/plugin.xml b/cross/org.eclipse.cdt.build.crossgcc/plugin.xml
old mode 100755
new mode 100644
index 225f47129f8..a081fe64dca
--- a/cross/org.eclipse.cdt.build.crossgcc/plugin.xml
+++ b/cross/org.eclipse.cdt.build.crossgcc/plugin.xml
@@ -78,6 +78,15 @@
                isAbstract="false"
                name="Cross GCC Linker"
                superClass="cdt.managedbuild.tool.gnu.c.linker">
+            <enablement
+                  type="ALL">
+               <not>
+                  <checkBuildProperty
+                        property="org.eclipse.cdt.build.core.buildArtefactType"
+                        value="org.eclipse.cdt.build.core.buildArtefactType.staticLib">
+                  </checkBuildProperty>
+               </not>
+            </enablement>
          </tool>
          <tool
                commandLineGenerator="org.eclipse.cdt.internal.build.crossgcc.CrossCommandLineGenerator"
@@ -85,6 +94,29 @@
                isAbstract="false"
                name="Cross G++ Linker"
                superClass="cdt.managedbuild.tool.gnu.cpp.linker">
+            <enablement
+                  type="ALL">
+               <not>
+                  <checkBuildProperty
+                        property="org.eclipse.cdt.build.core.buildArtefactType"
+                        value="org.eclipse.cdt.build.core.buildArtefactType.staticLib">
+                  </checkBuildProperty>
+               </not>
+            </enablement>
+         </tool>
+         <tool
+               commandLineGenerator="org.eclipse.cdt.internal.build.crossgcc.CrossCommandLineGenerator"
+               id="cdt.managedbuild.tool.gnu.cross.archiver"
+               isAbstract="false"
+               name="Cross GCC Archiver"
+               superClass="cdt.managedbuild.tool.gnu.archiver">
+            <enablement
+                  type="ALL">
+               <checkBuildProperty
+                     property="org.eclipse.cdt.build.core.buildArtefactType"
+                     value="org.eclipse.cdt.build.core.buildArtefactType.staticLib">
+               </checkBuildProperty>
+            </enablement>
          </tool>
       </toolChain>
 	     <projectType
diff --git a/windows/org.eclipse.cdt.msw.build/plugin.xml b/windows/org.eclipse.cdt.msw.build/plugin.xml
index 768292ef0b2..1bdff01da76 100644
--- a/windows/org.eclipse.cdt.msw.build/plugin.xml
+++ b/windows/org.eclipse.cdt.msw.build/plugin.xml
@@ -439,14 +439,23 @@
                id="org.eclipse.cdt.msvc.link.outputType.dll"
                outputs="dll">
          </outputType>
+         <enablement
+               type="ALL">
+            <not>
+               <checkBuildProperty
+                     property="org.eclipse.cdt.build.core.buildArtefactType"
+                     value="org.eclipse.cdt.build.core.buildArtefactType.staticLib">
+               </checkBuildProperty>
+            </not>
+         </enablement>
       </tool>
       <tool
             command="lib"
+            commandLinePattern="${COMMAND} ${FLAGS} ${OUTPUT_FLAG}${OUTPUT_PREFIX}${OUTPUT} ${INPUTS}"
             id="org.eclipse.cdt.msvc.lib"
             name="%lib.name"
             natureFilter="both"
-            outputFlag="/OUT:"
-            >
+            outputFlag="/OUT:">
          <supportedProperties>
             <property
                   id="org.eclipse.cdt.build.core.buildArtefactType">
@@ -474,6 +483,13 @@
                id="org.eclipse.cdt.msvc.lib.outputType"
                outputs="lib">
          </outputType>
+         <enablement
+               type="ALL">
+            <checkBuildProperty
+                  property="org.eclipse.cdt.build.core.buildArtefactType"
+                  value="org.eclipse.cdt.build.core.buildArtefactType.staticLib">
+            </checkBuildProperty>
+         </enablement>
       </tool>
       </toolChain>
       <configuration