From 7357cfd9eb44d1fc6b64f906a0e7b62f2268cee2 Mon Sep 17 00:00:00 2001
From: John Dallaway <john@dallaway.org.uk>
Date: Thu, 5 May 2022 11:11:51 +0100
Subject: [PATCH] Bug 577263: Eliminate unnecessary command line pattern
 attributes

We eliminate unnecessary command line pattern attributes that were
overriding the default pattern provided by
org.eclipse.cdt.managedbuilder.internal.core.Tool which now includes
${EXTRA_FLAGS}.

Change-Id: I8c4e8e613599e71e31e390f56319bacfd0329ab2
---
 .../plugin.xml                                     | 14 ++++----------
 1 file changed, 4 insertions(+), 10 deletions(-)

diff --git a/build/org.eclipse.cdt.managedbuilder.gnu.ui/plugin.xml b/build/org.eclipse.cdt.managedbuilder.gnu.ui/plugin.xml
index 06a8414c4e9..e35e6ee04c0 100644
--- a/build/org.eclipse.cdt.managedbuilder.gnu.ui/plugin.xml
+++ b/build/org.eclipse.cdt.managedbuilder.gnu.ui/plugin.xml
@@ -604,7 +604,6 @@
             name="%ToolName.linker.macosx.c"
             outputFlag="-o"
             command="gcc"
-            commandLinePattern="${COMMAND} ${FLAGS} ${OUTPUT_FLAG} ${OUTPUT_PREFIX}${OUTPUT} ${INPUTS}"
             id="cdt.managedbuild.tool.macosx.c.linker"
             errorParsers="org.eclipse.cdt.core.GLDErrorParser">
             <supportedProperties>
@@ -796,7 +795,6 @@
             name="%ToolName.linker.macosx.cpp"
             outputFlag="-o"
             command="g++"
-            commandLinePattern="${COMMAND} ${FLAGS} ${OUTPUT_FLAG} ${OUTPUT_PREFIX}${OUTPUT} ${INPUTS}"
             id="cdt.managedbuild.tool.macosx.cpp.linker"
             errorParsers="org.eclipse.cdt.core.GLDErrorParser">
             <supportedProperties>
@@ -2526,13 +2524,11 @@
 	              </targetPlatform>
 				  <tool
                       id="cdt.managedbuild.tool.gnu.solaris.cpp.compiler.base"
-                      superClass="cdt.managedbuild.tool.gnu.cpp.compiler.base"
-                      commandLinePattern="${COMMAND} ${FLAGS} ${OUTPUT_FLAG} ${OUTPUT_PREFIX}${OUTPUT} ${INPUTS}">                          
+                      superClass="cdt.managedbuild.tool.gnu.cpp.compiler.base">
                   </tool>
                   <tool
                       id="cdt.managedbuild.tool.gnu.solaris.c.compiler.base"
-                      superClass="cdt.managedbuild.tool.gnu.c.compiler.base"
-                      commandLinePattern="${COMMAND} ${FLAGS} ${OUTPUT_FLAG} ${OUTPUT_PREFIX}${OUTPUT} ${INPUTS}">                          
+                      superClass="cdt.managedbuild.tool.gnu.c.compiler.base">
 				  </tool>
 				  <tool
 		    		  id="cdt.managedbuild.tool.gnu.solaris.archiver.base"
@@ -2597,14 +2593,12 @@
 				  <tool
                       id="cdt.managedbuild.tool.gnu.solaris.cpp.compiler.base"
                       name="%ToolName.compiler.solaris.cpp"
-                      superClass="cdt.managedbuild.tool.gnu.cpp.compiler.base"
-                      commandLinePattern="${COMMAND} ${FLAGS} ${OUTPUT_FLAG} ${OUTPUT_PREFIX}${OUTPUT} ${INPUTS}">                          
+                      superClass="cdt.managedbuild.tool.gnu.cpp.compiler.base">
                   </tool>
                   <tool
                       id="cdt.managedbuild.tool.gnu.solaris.c.compiler.base"
                       name="%ToolName.compiler.solaris.c"
-                      superClass="cdt.managedbuild.tool.gnu.c.compiler.base"
-                      commandLinePattern="${COMMAND} ${FLAGS} ${OUTPUT_FLAG} ${OUTPUT_PREFIX}${OUTPUT} ${INPUTS}">                          
+                      superClass="cdt.managedbuild.tool.gnu.c.compiler.base">
 				  </tool>
 			  </toolChain>