mirror of
https://github.com/eclipse-cdt/cdt
synced 2025-04-23 14:42:11 +02:00
Fixed the bug related to the incorrect checking of the macros referenced in the environment variable definitions
This commit is contained in:
parent
2853cf688d
commit
d916648fee
1 changed files with 9 additions and 2 deletions
|
@ -799,8 +799,15 @@ public class EnvironmentBlock extends AbstractCOptionPage {
|
|||
if(macroProvider != null){
|
||||
IMacroContextInfo macroContextInfo = macroProvider.getMacroContextInfo(contextType,contextData);
|
||||
if(macroContextInfo != null){
|
||||
EnvVarUIMacroSubstitutor substitutor = new EnvVarUIMacroSubstitutor(macroContextInfo, null, " "); //$NON-NLS-2$
|
||||
MacroResolver.checkIntegrity(macroContextInfo,substitutor);
|
||||
EnvironmentVariableProvider provider = (EnvironmentVariableProvider)ManagedBuildManager.getEnvironmentVariableProvider();
|
||||
EnvVarCollector v = provider.getVariables(fCurrentContextInfo,true);
|
||||
if(v != null){
|
||||
EnvVarUIMacroSubstitutor substitutor = new EnvVarUIMacroSubstitutor(macroContextInfo, null, " "); //$NON-NLS-2$
|
||||
IBuildEnvironmentVariable vars[] = v.toArray(false);
|
||||
for(int i = 0; i < vars.length; i++){
|
||||
MacroResolver.checkMacros(vars[i].getValue(), substitutor);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
updateState(null);
|
||||
|
|
Loading…
Add table
Reference in a new issue