diff --git a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/core/Tool.java b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/core/Tool.java
index 76187fa8578..8c372adc2f4 100644
--- a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/core/Tool.java
+++ b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/core/Tool.java
@@ -2430,6 +2430,10 @@ public class Tool extends HoldsOptions implements ITool, IOptionCategory {
 							superClassId,
 							"tool",	//$NON-NLS-1$
 							getId());
+				} else {
+					//  All of our superclasses must be resolved in order to properly
+					//  resolve options to option categories   
+					((Tool)getSuperClass()).resolveReferences();
 				}
 			}
 			//  Resolve HoldsOptions 
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 214d941bd7c..2b8298b52ba 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
@@ -1319,6 +1319,10 @@ public class ToolChain extends HoldsOptions implements IToolChain {
 							superClassId,
 							"toolChain",	//$NON-NLS-1$
 							getId());
+				} else {
+					//  All of our superclasses must be resolved in order to properly
+					//  resolve options to option categories   
+					((ToolChain)getSuperClass()).resolveReferences();
 				}
 			}
 			//  Resolve HoldsOptions