From 30c4df2fce2d5cc4bf06f70b6d567ec16d98f069 Mon Sep 17 00:00:00 2001 From: Mikhail Sennikovsky Date: Thu, 16 Feb 2006 11:20:39 +0000 Subject: [PATCH] Fix for handling macros in tool commands --- .../internal/macros/OptionContextData.java | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/macros/OptionContextData.java b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/macros/OptionContextData.java index e7c10cc7e11..80aab958902 100644 --- a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/macros/OptionContextData.java +++ b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/macros/OptionContextData.java @@ -47,17 +47,13 @@ public class OptionContextData implements IOptionContextData { } public static IHoldsOptions getHolder(IOptionContextData data){ - IOption option = data.getOption(); - if(option == null) - return null; - IBuildObject buildObj = data.getParent(); IToolChain tCh = null; IHoldsOptions ho = null; IResourceConfiguration rcCfg = null; if(buildObj instanceof ITool) ho = (ITool)buildObj; - if(buildObj instanceof IToolChain) + else if(buildObj instanceof IToolChain) tCh = (IToolChain)buildObj; else if(buildObj instanceof IResourceConfiguration) rcCfg = (IResourceConfiguration)buildObj; @@ -65,6 +61,10 @@ public class OptionContextData implements IOptionContextData { tCh = ((IConfiguration)buildObj).getToolChain(); if(ho == null){ + IOption option = data.getOption(); + if(option == null) + return null; + ho = option.getOptionHolder(); ITool tools[] = null; if(tCh != null){