From 633b10b9543cb98f10d6cc65718d4f1cea79e1af Mon Sep 17 00:00:00 2001
From: Mikhail Sennikovsky <mikhail.sennikovskiy@gmail.com>
Date: Thu, 5 Jul 2007 11:03:50 +0000
Subject: [PATCH] fix for [Bug 195129] Makefile and parallel build fails

---
 .../internal/core/CommonBuilder.java           | 18 ++++++++++++++----
 1 file changed, 14 insertions(+), 4 deletions(-)

diff --git a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/core/CommonBuilder.java b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/core/CommonBuilder.java
index ee6e7524f2a..0c89cf6cda1 100644
--- a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/core/CommonBuilder.java
+++ b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/core/CommonBuilder.java
@@ -1869,7 +1869,7 @@ public class CommonBuilder extends ACBuilder {
 
 	// Turn the string into an array.
 	String[] makeArray(String string) {
-		string.trim();
+		string = string.trim();
 		char[] array = string.toCharArray();
 		ArrayList aList = new ArrayList();
 		StringBuffer buffer = new StringBuffer();
@@ -1884,14 +1884,24 @@ public class CommonBuilder extends ACBuilder {
 				}
 			}
 			if (c == ' ' && !inComment) {
-				aList.add(buffer.toString());
+				if (buffer.length() > 0){
+					String str = buffer.toString().trim();
+					if(str.length() > 0){
+						aList.add(str);
+					}
+				}
+//				aList.add(buffer.toString());
 				buffer = new StringBuffer();
 			} else {
 				buffer.append(c);
 			}
 		}
-		if (buffer.length() > 0)
-			aList.add(buffer.toString());
+		if (buffer.length() > 0){
+			String str = buffer.toString().trim();
+			if(str.length() > 0){
+				aList.add(str);
+			}
+		}
 		return (String[]) aList.toArray(new String[aList.size()]);
 	}