Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDoug Schaefer2018-01-10 11:26:23 -0500
committerDoug Schaefer2018-01-10 12:15:56 -0500
commit7627e275ef3604b179fe8c92ca8c4ad461824a67 (patch)
tree40b6c3044baa5a22cd423452684af4a600158aed /build/org.eclipse.cdt.make.core
parent49f1411c7b91522ce55e3af40afe5eddb9697a5a (diff)
downloadorg.eclipse.cdt-7627e275ef3604b179fe8c92ca8c4ad461824a67.tar.gz
org.eclipse.cdt-7627e275ef3604b179fe8c92ca8c4ad461824a67.tar.xz
org.eclipse.cdt-7627e275ef3604b179fe8c92ca8c4ad461824a67.zip
Bug 529121 - NPE fix for projects created with CMake
Not sure what changed but the launcher for these projects is now returning null for an environment. Added a null check. Change-Id: I05c94bb77f951f417577d0c2a3e3b4b6b996214b (cherry picked from commit be9c1b833828d8bb01059579e32fa4c08c47ea4c)
Diffstat (limited to 'build/org.eclipse.cdt.make.core')
-rw-r--r--build/org.eclipse.cdt.make.core/src/org/eclipse/cdt/make/core/MakeBuilder.java4
1 files changed, 3 insertions, 1 deletions
diff --git a/build/org.eclipse.cdt.make.core/src/org/eclipse/cdt/make/core/MakeBuilder.java b/build/org.eclipse.cdt.make.core/src/org/eclipse/cdt/make/core/MakeBuilder.java
index 50a9e61e5e..d70ab78ec1 100644
--- a/build/org.eclipse.cdt.make.core/src/org/eclipse/cdt/make/core/MakeBuilder.java
+++ b/build/org.eclipse.cdt.make.core/src/org/eclipse/cdt/make/core/MakeBuilder.java
@@ -246,7 +246,9 @@ public class MakeBuilder extends ACBuilder {
if (info.appendEnvironment()) {
@SuppressWarnings({"unchecked", "rawtypes"})
Map<String, String> env = (Map)launcher.getEnvironment();
- envMap.putAll(env);
+ if (env != null) {
+ envMap.putAll(env);
+ }
}
envMap.putAll(info.getExpandedEnvironment());
return envMap;

Back to the top