Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarc-Andre Laperle2011-07-26 00:37:37 -0400
committerMarc-Andre Laperle2011-07-26 00:37:37 -0400
commitc7f03bd3d99986215778bbac8b3b081ed2a6ae03 (patch)
tree6398d64a904d9221081a7eafbfc38217848449d2
parentd592d691aaa79832843e991734a3ef2c1a819c40 (diff)
downloadorg.eclipse.cdt-c7f03bd3d99986215778bbac8b3b081ed2a6ae03.tar.gz
org.eclipse.cdt-c7f03bd3d99986215778bbac8b3b081ed2a6ae03.tar.xz
org.eclipse.cdt-c7f03bd3d99986215778bbac8b3b081ed2a6ae03.zip
Bug 344009 - Eclipse CDT uses wrong command to build static library
(crossgcc, msvc)
-rw-r--r--[-rwxr-xr-x]cross/org.eclipse.cdt.build.crossgcc/plugin.xml32
-rw-r--r--windows/org.eclipse.cdt.msw.build/plugin.xml20
2 files changed, 50 insertions, 2 deletions
diff --git a/cross/org.eclipse.cdt.build.crossgcc/plugin.xml b/cross/org.eclipse.cdt.build.crossgcc/plugin.xml
index 225f47129f..a081fe64dc 100755..100644
--- 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 768292ef0b..1bdff01da7 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

Back to the top