mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-06-08 18:26:01 +02:00
Code Issues Wiki Activity

Fix for handling macros in tool commands

Browse source
This commit is contained in:
Mikhail Sennikovsky 2006-02-16 11:20:39 +00:00
parent 2551429a69
commit 30c4df2fce
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/macros/OptionContextData.java
View file

@ -47,17 +47,13 @@ public class OptionContextData implements IOptionContextData {
} }
public static IHoldsOptions getHolder(IOptionContextData data){ public static IHoldsOptions getHolder(IOptionContextData data){
IOption option = data.getOption();
if(option == null)
return null;
IBuildObject buildObj = data.getParent(); IBuildObject buildObj = data.getParent();
IToolChain tCh = null; IToolChain tCh = null;
IHoldsOptions ho = null; IHoldsOptions ho = null;
IResourceConfiguration rcCfg = null; IResourceConfiguration rcCfg = null;
if(buildObj instanceof ITool) if(buildObj instanceof ITool)
ho = (ITool)buildObj; ho = (ITool)buildObj;
if(buildObj instanceof IToolChain) else if(buildObj instanceof IToolChain)
tCh = (IToolChain)buildObj; tCh = (IToolChain)buildObj;
else if(buildObj instanceof IResourceConfiguration) else if(buildObj instanceof IResourceConfiguration)
rcCfg = (IResourceConfiguration)buildObj; rcCfg = (IResourceConfiguration)buildObj;
@ -65,6 +61,10 @@ public class OptionContextData implements IOptionContextData {
tCh = ((IConfiguration)buildObj).getToolChain(); tCh = ((IConfiguration)buildObj).getToolChain();
if(ho == null){ if(ho == null){
IOption option = data.getOption();
if(option == null)
return null;
ho = option.getOptionHolder(); ho = option.getOptionHolder();
ITool tools[] = null; ITool tools[] = null;
if(tCh != null){ if(tCh != null){