From b224117ea2d2478ec3c646f13a1c32db5a51137d Mon Sep 17 00:00:00 2001
From: Mikhail Sennikovsky <mikhail.sennikovskiy@gmail.com>
Date: Thu, 30 Mar 2006 12:03:24 +0000
Subject: [PATCH] Fix for configuration context calculation

---
 .../macros/DefaultMacroContextInfo.java        | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/macros/DefaultMacroContextInfo.java b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/macros/DefaultMacroContextInfo.java
index d898183a086..b49f33ac587 100644
--- a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/macros/DefaultMacroContextInfo.java
+++ b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/macros/DefaultMacroContextInfo.java
@@ -167,6 +167,24 @@ public class DefaultMacroContextInfo implements IMacroContextInfo {
 					return new DefaultMacroContextInfo(
 							IBuildMacroProvider.CONTEXT_CONFIGURATION,
 							((IToolChain)ho).getParent());
+				else {
+					IBuildObject buildObj = optionContext.getParent();
+                    IConfiguration cfg = null; 
+                    if(buildObj instanceof ITool) 
+                       buildObj = ((ITool)buildObj).getParent(); 
+                    if(buildObj instanceof IToolChain) 
+                       cfg = ((IToolChain)buildObj).getParent(); 
+                    else if(buildObj instanceof IResourceConfiguration) 
+                       cfg = ((IResourceConfiguration)buildObj).getParent(); 
+                    else if(buildObj instanceof IConfiguration) 
+                       cfg = (IConfiguration)buildObj; 
+
+                    if(cfg != null){ 
+                        return new DefaultMacroContextInfo( 
+                        		IBuildMacroProvider.CONTEXT_CONFIGURATION, 
+                        		cfg); 
+                    } 
+				}
 			}
 			break;
 		case IBuildMacroProvider.CONTEXT_TOOL: