Skip to main content
aboutsummaryrefslogtreecommitdiffstats
path: root/build
diff options
context:
space:
mode:
authorMikhail Sennikovsky2005-08-03 17:06:56 +0000
committerMikhail Sennikovsky2005-08-03 17:06:56 +0000
commit9e2941d120ddf6e688166c21f2714be67450b816 (patch)
tree55381cdc597203c42cc66e6d6d8d2fd13a99cd32 /build
parent7860f3c7655fbe317d48d2102a675b92eca1e6d0 (diff)
downloadorg.eclipse.cdt-9e2941d120ddf6e688166c21f2714be67450b816.tar.gz
org.eclipse.cdt-9e2941d120ddf6e688166c21f2714be67450b816.tar.xz
org.eclipse.cdt-9e2941d120ddf6e688166c21f2714be67450b816.zip
Checked in the fix for the bug# 105754
Diffstat (limited to 'build')
-rw-r--r--build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/core/ManagedBuildInfo.java22
1 files changed, 10 insertions, 12 deletions
diff --git a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/core/ManagedBuildInfo.java b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/core/ManagedBuildInfo.java
index 84510e20716..303889d3efa 100644
--- a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/core/ManagedBuildInfo.java
+++ b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/core/ManagedBuildInfo.java
@@ -405,10 +405,11 @@ public class ManagedBuildInfo implements IManagedBuildInfo, IScannerInfo {
*/
public String[] getLibsForConfiguration(String extension) {
Vector libs = new Vector();
- ITool[] tools = getFilteredTools();
- for (int index = 0; index < tools.length; index++) {
- ITool tool = tools[index];
- if (tool.producesFileType(extension)) {
+ ITool tool = getDefaultConfiguration().getTargetTool();
+ if(tool == null)
+ tool = getToolFromOutputExtension(extension);
+
+ if(tool != null){
IOption[] opts = tool.getOptions();
// Look for the lib option type
for (int i = 0; i < opts.length; i++) {
@@ -452,7 +453,6 @@ public class ManagedBuildInfo implements IManagedBuildInfo, IScannerInfo {
continue;
}
}
- }
}
return (String[])libs.toArray(new String[libs.size()]);
}
@@ -739,12 +739,11 @@ public class ManagedBuildInfo implements IManagedBuildInfo, IScannerInfo {
*/
public String[] getUserObjectsForConfiguration(String extension) {
Vector objs = new Vector();
- // Get all the tools for the current config
- ITool[] tools = getFilteredTools();
- for (int index = 0; index < tools.length; index++) {
- ITool tool = tools[index];
- // The tool is OK for this project nature
- if (tool.producesFileType(extension)) {
+ ITool tool = getDefaultConfiguration().getTargetTool();
+ if(tool == null)
+ tool = getToolFromOutputExtension(extension);
+
+ if(tool != null){
IOption[] opts = tool.getOptions();
// Look for the user object option type
for (int i = 0; i < opts.length; i++) {
@@ -775,7 +774,6 @@ public class ManagedBuildInfo implements IManagedBuildInfo, IScannerInfo {
continue;
}
}
- }
}
return (String[])objs.toArray(new String[objs.size()]);
}

Back to the top