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 6a0f298302e..ddcb903adf2 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 @@ -2569,7 +2569,9 @@ public class Tool extends HoldsOptions implements ITool, IOptionCategory, IMatch ArrayList flags = new ArrayList(); StringBuffer sb = new StringBuffer(); for (int index = 0; index < opts.length; index++) { - IOption option = opts[index]; + IOption option = getOptionToSet(opts[index], false); + if (option == null) + continue; sb.setLength( 0 ); // check to see if the option has an applicability calculator