From 6a72f4f07c652d3c72e4f760f3cb90c456857695 Mon Sep 17 00:00:00 2001
From: William Riley <william.riley@renesas.com>
Date: Mon, 12 Feb 2018 09:18:24 +0000
Subject: [PATCH] Bug 531028 - Pass build config to all builders during
 headless build

Change-Id: Ia802d07e9da88fcb42274633d4321212d5eb6096
Signed-off-by: William Riley <william.riley@renesas.com>
---
 .../managedbuilder/internal/core/HeadlessBuilder.java    | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/core/HeadlessBuilder.java b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/core/HeadlessBuilder.java
index ee898424b89..29ad3614f9b 100644
--- a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/core/HeadlessBuilder.java
+++ b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/core/HeadlessBuilder.java
@@ -282,8 +282,15 @@ public class HeadlessBuilder implements IApplication {
 						if (commands[i].getBuilderName().equals(CommonBuilder.BUILDER_ID)) {
 							proj.build(buildType, CommonBuilder.BUILDER_ID, map, new SubProgressMonitor(monitor, 1));
 						} else {
+							//Combine command args with build args
+							Map<String, String> args = commands[i].getArguments();
+							if(args != null) {
+								args.putAll(map);
+							} else {
+								args = map;
+							}
 							proj.build(buildType, commands[i].getBuilderName(),
-							commands[i].getArguments(), new SubProgressMonitor(monitor, 1));
+									args, new SubProgressMonitor(monitor, 1));
 						}
 					}
 					monitor.done();