diff --git a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/buildmodel/BuildDescription.java b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/buildmodel/BuildDescription.java
index f23ce917ea5..3d320173be8 100644
--- a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/buildmodel/BuildDescription.java
+++ b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/buildmodel/BuildDescription.java
@@ -566,7 +566,7 @@ public class BuildDescription implements IBuildDescription {
 			//  Generate the step to build this source file
 			IInputType primaryInputType = tool.getPrimaryInputType();
 			if ((primaryInputType != null && !primaryInputType.getMultipleOfType()) ||
-				(inputType == null && tool != fCfg.getToolFromOutputExtension(fCfg.getArtifactExtension()))){
+				(inputType == null && tool != fCfg.calculateTargetTool())){
 					
 				BuildStep action = null;
 				BuildIOType argument = null;
diff --git a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/makegen/gnu/GnuMakefileGenerator.java b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/makegen/gnu/GnuMakefileGenerator.java
index e953fe6bda2..6e3a32330b6 100644
--- a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/makegen/gnu/GnuMakefileGenerator.java
+++ b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/makegen/gnu/GnuMakefileGenerator.java
@@ -1894,7 +1894,7 @@ public class GnuMakefileGenerator implements IManagedBuilderMakefileGenerator {
 			IInputType primaryInputType = tool.getPrimaryInputType();
 			IInputType inputType = tool.getInputType(ext);
 			if ((primaryInputType != null && !primaryInputType.getMultipleOfType()) ||
-				(inputType == null && !(tool == info.getToolFromOutputExtension(buildTargetExt))))	{
+				(inputType == null && tool != config.calculateTargetTool()))	{
 				
 				// Try to add the rule for the file
 				Vector generatedOutputs = new Vector();		//  IPath's - build directory relative