# HG changeset patch
# User Ed Swartz <ed.swartz@nokia.com>
# Date 1264693619 21600
# Node ID 381d143dacc3cbc54e5564fce7b87fa45713aff3
# Parent  eb9903eb53520e1dcdb4574aac87e0d9a59b5edf# Parent  565becd9a91eeced63ed690e05d56fa8e9ac851e
Merge commit

diff -r 565becd9a91e -r 381d143dacc3 builder/com.nokia.carbide.cdt.builder/src/com/nokia/carbide/cdt/internal/builder/EnvironmentVarsInfo2.java
--- a/builder/com.nokia.carbide.cdt.builder/src/com/nokia/carbide/cdt/internal/builder/EnvironmentVarsInfo2.java	Wed Jan 27 16:02:59 2010 -0600
+++ b/builder/com.nokia.carbide.cdt.builder/src/com/nokia/carbide/cdt/internal/builder/EnvironmentVarsInfo2.java	Thu Jan 28 09:46:59 2010 -0600
@@ -461,8 +461,11 @@
 	private Map<String, String> stringArrayToMap(String[] array) {
 		Map<String, String> map = new HashMap<String, String>(array.length);
 		for (String var : array) {
-			String[] split = var.split("=");
-			map.put(split[0], split[1]);
+			int idx = var.indexOf('=');
+			if (idx > 0)
+				map.put(var.substring(0, idx), var.substring(idx+1));
+			else if (var.length() > 0)
+				map.put(var, "");
 		}
 		
 		return map;