From d0e528d135360213ac35a1ec4ebd1c792d28b673 Mon Sep 17 00:00:00 2001
From: Doug Schaefer <dschaefer@blackberry.com>
Date: Wed, 29 Nov 2017 11:52:35 -0500
Subject: [PATCH] Fix manual include/macro settings handling for GCCToolChain.

We weren't passing in the base settings to the compiler for
discovery. Also had a bug in the defines regex that mishandled
values with spaces in them.

Change-Id: I48183bfc3f61056324da009e58327cdcfed8754a
---
 .../cdt/build/gcc/core/GCCToolChain.java      | 39 +++++++++++++++----
 1 file changed, 31 insertions(+), 8 deletions(-)

diff --git a/build/org.eclipse.cdt.build.gcc.core/src/org/eclipse/cdt/build/gcc/core/GCCToolChain.java b/build/org.eclipse.cdt.build.gcc.core/src/org/eclipse/cdt/build/gcc/core/GCCToolChain.java
index 4b1bc8b16ff..49ec7158843 100644
--- a/build/org.eclipse.cdt.build.gcc.core/src/org/eclipse/cdt/build/gcc/core/GCCToolChain.java
+++ b/build/org.eclipse.cdt.build.gcc.core/src/org/eclipse/cdt/build/gcc/core/GCCToolChain.java
@@ -252,9 +252,21 @@ public class GCCToolChain extends PlatformObject implements IToolChain {
 				commandLine.add(getCommandPath(command).toString());
 			}
 
-			if (baseScannerInfo != null && baseScannerInfo.getIncludePaths() != null) {
-				for (String includePath : baseScannerInfo.getIncludePaths()) {
-					commandLine.add("-I" + includePath); //$NON-NLS-1$
+			if (baseScannerInfo != null) {
+				if (baseScannerInfo.getIncludePaths() != null) {
+					for (String includePath : baseScannerInfo.getIncludePaths()) {
+						commandLine.add("-I" + includePath); //$NON-NLS-1$
+					}
+				}
+
+				if (baseScannerInfo.getDefinedSymbols() != null) {
+					for (Map.Entry<String, String> macro : baseScannerInfo.getDefinedSymbols().entrySet()) {
+						if (macro.getValue() != null && !macro.getValue().isEmpty()) {
+							commandLine.add("-D" + macro.getKey() + "=" + macro.getValue()); //$NON-NLS-1$
+						} else {
+							commandLine.add("-D" + macro.getKey()); //$NON-NLS-1$
+						}
+					}
 				}
 			}
 
@@ -358,9 +370,21 @@ public class GCCToolChain extends PlatformObject implements IToolChain {
 				commandLine.add(getCommandPath(command).toString());
 			}
 
-			if (baseScannerInfo != null && baseScannerInfo.getIncludePaths() != null) {
-				for (String includePath : baseScannerInfo.getIncludePaths()) {
-					commandLine.add("-I" + includePath); //$NON-NLS-1$
+			if (baseScannerInfo != null) {
+				if (baseScannerInfo.getIncludePaths() != null) {
+					for (String includePath : baseScannerInfo.getIncludePaths()) {
+						commandLine.add("-I" + includePath); //$NON-NLS-1$
+					}
+				}
+				
+				if (baseScannerInfo.getDefinedSymbols() != null) {
+					for (Map.Entry<String, String> macro : baseScannerInfo.getDefinedSymbols().entrySet()) {
+						if (macro.getValue() != null && !macro.getValue().isEmpty()) {
+							commandLine.add("-D" + macro.getKey() + "=" + macro.getValue()); //$NON-NLS-1$
+						} else {
+							commandLine.add("-D" + macro.getKey()); //$NON-NLS-1$
+						}
+					}
 				}
 			}
 
@@ -405,7 +429,7 @@ public class GCCToolChain extends PlatformObject implements IToolChain {
 		// Scan for the scanner info
 		Map<String, String> symbols = new HashMap<>();
 		List<String> includePath = new ArrayList<>();
-		Pattern definePattern = Pattern.compile("#define (.*)\\s(.*)"); //$NON-NLS-1$
+		Pattern definePattern = Pattern.compile("#define ([^\\s]*)\\s(.*)"); //$NON-NLS-1$
 		boolean inIncludePaths = false;
 		try (BufferedReader reader = new BufferedReader(new InputStreamReader(process.getInputStream()))) {
 			for (String line = reader.readLine(); line != null; line = reader.readLine()) {
@@ -434,7 +458,6 @@ public class GCCToolChain extends PlatformObject implements IToolChain {
 		Files.delete(tmpFile);
 
 		return new ExtendedScannerInfo(symbols, includePath.toArray(new String[includePath.size()]));
-
 	}
 
 	@Override