mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-07-31 21:05:37 +02:00
Code Issues Wiki Activity

bug 407502: NPE when I open Make Target View

Browse source
This commit is contained in:
Andrew Gvozdev 2013-06-20 17:39:08 -04:00
parent bd43cfa615
commit 07341495e4
1 changed files with 6 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/envvar/EnvironmentVariableManagerToolChain.java
View file

@ -138,11 +138,17 @@ public class EnvironmentVariableManagerToolChain extends EnvironmentVariableMana
} }
@Override @Override
public ICdtVariable getVariable(String macroName, IVariableContextInfo context) { public ICdtVariable getVariable(String macroName, IVariableContextInfo context) {
if (toolchainSupplier == null) {
return null;
}
IEnvironmentVariable var = toolchainSupplier.getVariable(macroName, null, ManagedBuildManager.getEnvironmentVariableProvider()); IEnvironmentVariable var = toolchainSupplier.getVariable(macroName, null, ManagedBuildManager.getEnvironmentVariableProvider());
return CdtVariableManager.fEnvironmentMacroSupplier.createBuildMacro(var); return CdtVariableManager.fEnvironmentMacroSupplier.createBuildMacro(var);
} }
@Override @Override
public ICdtVariable[] getVariables(IVariableContextInfo context) { public ICdtVariable[] getVariables(IVariableContextInfo context) {
if (toolchainSupplier == null) {
return null;
}
IEnvironmentVariable[] vars = toolchainSupplier.getVariables(null, ManagedBuildManager.getEnvironmentVariableProvider()); IEnvironmentVariable[] vars = toolchainSupplier.getVariables(null, ManagedBuildManager.getEnvironmentVariableProvider());
if (vars != null) { if (vars != null) {
ICdtVariable[] cdtVars = new ICdtVariable[vars.length]; ICdtVariable[] cdtVars = new ICdtVariable[vars.length];