From d7f3e235cc0445bd1f3f0e8c56ef38c7a3d2aeaf Mon Sep 17 00:00:00 2001
From: Oleg Krasilnikov <oleg.krasilnikov@intel.com>
Date: Thu, 21 Feb 2008 15:26:39 +0000
Subject: [PATCH] Bug # 219684 : ApplicabilityCalculator can't set bool val in
 CDT4

---
 .../org/eclipse/cdt/managedbuilder/internal/core/Tool.java    | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

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