mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-04-23 22:52:11 +02:00
Code Issues Wiki Activity

additional target tool calculation fixes

Browse source
This commit is contained in:
Mikhail Sennikovsky 2006-05-18 15:11:47 +00:00
parent c39dabe4c2
commit e55a3d34c0
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/buildmodel/BuildDescription.java
View file

@ -566,7 +566,7 @@ public class BuildDescription implements IBuildDescription {
// Generate the step to build this source file // Generate the step to build this source file
IInputType primaryInputType = tool.getPrimaryInputType(); IInputType primaryInputType = tool.getPrimaryInputType();
if ((primaryInputType != null && !primaryInputType.getMultipleOfType()) || if ((primaryInputType != null && !primaryInputType.getMultipleOfType()) ||
(inputType == null && tool != fCfg.getToolFromOutputExtension(fCfg.getArtifactExtension()))){ (inputType == null && tool != fCfg.calculateTargetTool())){
BuildStep action = null; BuildStep action = null;
BuildIOType argument = null; BuildIOType argument = null;

2
build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/makegen/gnu/GnuMakefileGenerator.java
View file

@ -1894,7 +1894,7 @@ public class GnuMakefileGenerator implements IManagedBuilderMakefileGenerator {
IInputType primaryInputType = tool.getPrimaryInputType(); IInputType primaryInputType = tool.getPrimaryInputType();
IInputType inputType = tool.getInputType(ext); IInputType inputType = tool.getInputType(ext);
if ((primaryInputType != null && !primaryInputType.getMultipleOfType()) || if ((primaryInputType != null && !primaryInputType.getMultipleOfType()) ||
(inputType == null && !(tool == info.getToolFromOutputExtension(buildTargetExt)))) { (inputType == null && tool != config.calculateTargetTool())) {
// Try to add the rule for the file // Try to add the rule for the file
Vector generatedOutputs = new Vector(); // IPath's - build directory relative Vector generatedOutputs = new Vector(); // IPath's - build directory relative