Skip to main content
aboutsummaryrefslogtreecommitdiffstats
path: root/build
diff options
context:
space:
mode:
authorJames Blackburn2011-02-15 12:14:59 +0000
committerJames Blackburn2011-02-15 12:14:59 +0000
commit55ba7fa2f451d9e9faa61bee88626cc32ecbe8c0 (patch)
treee92eaa6b3623e1a631881c073463822d4e9fa2bb /build
parent9c85e9f65176b1a85874beb1116e3aeb125e2996 (diff)
downloadorg.eclipse.cdt-55ba7fa2f451d9e9faa61bee88626cc32ecbe8c0.tar.gz
org.eclipse.cdt-55ba7fa2f451d9e9faa61bee88626cc32ecbe8c0.tar.xz
org.eclipse.cdt-55ba7fa2f451d9e9faa61bee88626cc32ecbe8c0.zip
Bug 326671 - Fix potential NPE when building old tests.
Diffstat (limited to 'build')
-rw-r--r--build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/makegen/gnu/GnuMakefileGenerator.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/makegen/gnu/GnuMakefileGenerator.java b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/makegen/gnu/GnuMakefileGenerator.java
index bc69872d715..bddefbb1c90 100644
--- a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/makegen/gnu/GnuMakefileGenerator.java
+++ b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/makegen/gnu/GnuMakefileGenerator.java
@@ -1296,7 +1296,7 @@ public class GnuMakefileGenerator implements IManagedBuilderMakefileGenerator2 {
// If this configuration produces a static archive, building the archive doesn't depend on the output
// from any of the referenced configurations
IConfiguration[] refConfigs = new IConfiguration[0];
- if (!ManagedBuildManager.BUILD_ARTEFACT_TYPE_PROPERTY_STATICLIB.equals(config.getBuildArtefactType().getId()))
+ if (config.getBuildArtefactType() == null || !ManagedBuildManager.BUILD_ARTEFACT_TYPE_PROPERTY_STATICLIB.equals(config.getBuildArtefactType().getId()))
refConfigs = ManagedBuildManager.getReferencedConfigurations(config);
/* try {

Back to the top