diff --git a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/core/ResourceConfiguration.java b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/core/ResourceConfiguration.java
index 9ce55f3e18e..507a28fa436 100644
--- a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/core/ResourceConfiguration.java
+++ b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/core/ResourceConfiguration.java
@@ -981,15 +981,15 @@ public class ResourceConfiguration extends ResourceInfo implements IFileInfo {
 			String ext = path.getFileExtension();
 			if(ext == null)
 				ext = ""; //$NON-NLS-1$
-			ITool tool = ((FolderInfo)parentRc).getToolFromInputExtension(ext);
-			if(tool == null)
+			ITool otherTool = ((FolderInfo)parentRc).getToolFromInputExtension(ext);
+			if(otherTool == null)
 				return true;
 			
 			ITool[] tti = getToolsToInvoke();
 			if(tti.length != 1)
 				return true;
 			
-			return ((Tool)tool).hasCustomSettings((Tool)tti[0]);
+			return ((Tool)tti[0]).hasCustomSettings((Tool)otherTool);
 		}
 		ITool[] tools = getTools();
 		ITool[] otherTools = ((IFileInfo)parentRc).getTools();
diff --git a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/core/ToolChain.java b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/core/ToolChain.java
index e4a0e4d8301..c9f12df413d 100644
--- a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/core/ToolChain.java
+++ b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/core/ToolChain.java
@@ -2705,7 +2705,7 @@ public class ToolChain extends HoldsOptions implements IToolChain, IBuildPropert
 		ITool[] tools = getTools();
 		ITool[] otherTools = tCh.getTools();
 		if(tools.length != otherTools.length)
-			return false;
+			return true;
 		
 		for(int i = 0; i < tools.length; i++){
 			Tool tool = (Tool)tools[i];