From 7627e275ef3604b179fe8c92ca8c4ad461824a67 Mon Sep 17 00:00:00 2001
From: Doug Schaefer
Date: Wed, 10 Jan 2018 11:26:23 -0500
Subject: 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)
---
 .../src/org/eclipse/cdt/make/core/MakeBuilder.java                    | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'build/org.eclipse.cdt.make.core')

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 50a9e61e5e8..d70ab78ec1b 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;
-- 
cgit v1.2.3