From a58a1bdd2eaa02022dce327e43d22512c3e2361e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Torbj=C3=B6rn=20Svensson?= Date: Tue, 19 Apr 2022 21:44:54 +0200 Subject: [PATCH] Bug 579756: Add support for prefixed toolchain binaries in parser MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The GCCBuildCOmmandParser expects the compiler tool to be exactly what's included in the pattern, i.e. a prefixed toolchain (for example "arm-none-eabi-" would not match. Contributed by STMicroelectronics Change-Id: I9e6b83509ecac9c382f565e5c7b737d12398a196 Signed-off-by: Torbjörn Svensson --- build/org.eclipse.cdt.autotools.core/plugin.xml | 2 +- build/org.eclipse.cdt.managedbuilder.core/plugin.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build/org.eclipse.cdt.autotools.core/plugin.xml b/build/org.eclipse.cdt.autotools.core/plugin.xml index 09bbe747b2e..972dcb8e1b2 100644 --- a/build/org.eclipse.cdt.autotools.core/plugin.xml +++ b/build/org.eclipse.cdt.autotools.core/plugin.xml @@ -652,7 +652,7 @@ class="org.eclipse.cdt.managedbuilder.language.settings.providers.GCCBuildCommandParser" id="org.eclipse.cdt.autotools.core.LibtoolGCCBuildCommandParser" name="%LibtoolGCCBuildOutputParser.name" - parameter="(libtool:\s+compile:\s+)?((g?cc)|([gc]\+\+)|(clang))" + parameter="(libtool:\s+compile:\s+)?([^/\\\\]*)((g?cc)|([gc]\+\+)|(clang))" prefer-non-shared="true"> diff --git a/build/org.eclipse.cdt.managedbuilder.core/plugin.xml b/build/org.eclipse.cdt.managedbuilder.core/plugin.xml index b054e00a424..f4892de8a22 100644 --- a/build/org.eclipse.cdt.managedbuilder.core/plugin.xml +++ b/build/org.eclipse.cdt.managedbuilder.core/plugin.xml @@ -629,7 +629,7 @@ class="org.eclipse.cdt.managedbuilder.language.settings.providers.GCCBuildCommandParser" id="org.eclipse.cdt.managedbuilder.core.GCCBuildCommandParser" name="%GCCBuildOutputParser.name" - parameter="(g?cc)|([gc]\+\+)|(clang)" + parameter="([^/\\\\]*)((g?cc)|([gc]\+\+)|(clang))" prefer-non-shared="true">