From bb9a33bb6c352eeb9e5779ecbdc2103cee92349a Mon Sep 17 00:00:00 2001 From: Jonah Graham Date: Fri, 11 Nov 2022 13:09:58 -0500 Subject: [PATCH] Use new ALL_FLAGS feature of CDT for discovery CDT 11 includes a new ${ALL_FLAGS} that can be specified in the scanner discovery to pick up all command line options specified in the managed build. See the N&N entry at: https://github.com/jonah/cdt/blob/main/NewAndNoteworthy/CDT-11.0.md#scanner-discovery-considering-all-flags This change is not required as CDT's change is non-breaking. But to use ALL_FLAGS you need CDT 11 or newer, specifically for org.eclipse.cdt.managedbuilder.core;bundle-version="9.5.0" --- .../META-INF/MANIFEST.MF | 2 +- .../org.eclipse.embedcdt.managedbuild.cross.arm.core/plugin.xml | 2 +- .../META-INF/MANIFEST.MF | 2 +- .../plugin.xml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/plugins/org.eclipse.embedcdt.managedbuild.cross.arm.core/META-INF/MANIFEST.MF b/plugins/org.eclipse.embedcdt.managedbuild.cross.arm.core/META-INF/MANIFEST.MF index 4fdc56b39..efe6c0529 100644 --- a/plugins/org.eclipse.embedcdt.managedbuild.cross.arm.core/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.embedcdt.managedbuild.cross.arm.core/META-INF/MANIFEST.MF @@ -7,7 +7,7 @@ Bundle-Activator: org.eclipse.embedcdt.internal.managedbuild.cross.arm.core.Acti Require-Bundle: org.eclipse.embedcdt.core;bundle-version="6.3.1", org.eclipse.embedcdt.managedbuild.cross.core;bundle-version="2.1.0", org.eclipse.cdt.core;bundle-version="7.0.0", - org.eclipse.cdt.managedbuilder.core;bundle-version="9.0.0", + org.eclipse.cdt.managedbuilder.core;bundle-version="9.5.0", org.eclipse.core.expressions;bundle-version="3.7.0", org.eclipse.core.resources;bundle-version="3.13.800", org.eclipse.core.runtime;bundle-version="3.19.0" diff --git a/plugins/org.eclipse.embedcdt.managedbuild.cross.arm.core/plugin.xml b/plugins/org.eclipse.embedcdt.managedbuild.cross.arm.core/plugin.xml index cac982ce7..f8ee90abd 100644 --- a/plugins/org.eclipse.embedcdt.managedbuild.cross.arm.core/plugin.xml +++ b/plugins/org.eclipse.embedcdt.managedbuild.cross.arm.core/plugin.xml @@ -3614,7 +3614,7 @@ class="org.eclipse.cdt.managedbuilder.language.settings.providers.GCCBuiltinSpecsDetector" id="org.eclipse.embedcdt.managedbuild.cross.arm.core.GCCBuiltinSpecsDetector" name="%GCCBuiltinSpecsDetector.name" - parameter="${COMMAND} ${FLAGS} ${cross_toolchain_flags} -E -P -v -dD "${INPUTS}"" + parameter="${COMMAND} ${ALL_FLAGS} ${cross_toolchain_flags} -E -P -v -dD "${INPUTS}"" prefer-non-shared="true"> diff --git a/plugins/org.eclipse.embedcdt.managedbuild.cross.riscv.core/META-INF/MANIFEST.MF b/plugins/org.eclipse.embedcdt.managedbuild.cross.riscv.core/META-INF/MANIFEST.MF index 55959f063..d3b934e3a 100644 --- a/plugins/org.eclipse.embedcdt.managedbuild.cross.riscv.core/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.embedcdt.managedbuild.cross.riscv.core/META-INF/MANIFEST.MF @@ -9,7 +9,7 @@ Require-Bundle: org.eclipse.embedcdt.core;bundle-version="6.3.1", org.eclipse.embedcdt.debug.core;bundle-version="2.0.0", org.eclipse.embedcdt.managedbuild.cross.core;bundle-version="2.1.0", org.eclipse.cdt.core;bundle-version="7.0.0", - org.eclipse.cdt.managedbuilder.core;bundle-version="9.0.0", + org.eclipse.cdt.managedbuilder.core;bundle-version="9.5.0", org.eclipse.core.expressions;bundle-version="3.7.0", org.eclipse.core.resources;bundle-version="3.13.800", org.eclipse.core.runtime;bundle-version="3.19.0", diff --git a/plugins/org.eclipse.embedcdt.managedbuild.cross.riscv.core/plugin.xml b/plugins/org.eclipse.embedcdt.managedbuild.cross.riscv.core/plugin.xml index 007090cf9..f983038a5 100644 --- a/plugins/org.eclipse.embedcdt.managedbuild.cross.riscv.core/plugin.xml +++ b/plugins/org.eclipse.embedcdt.managedbuild.cross.riscv.core/plugin.xml @@ -2529,7 +2529,7 @@ class="org.eclipse.cdt.managedbuilder.language.settings.providers.GCCBuiltinSpecsDetector" id="org.eclipse.embedcdt.managedbuild.cross.riscv.core.GCCBuiltinSpecsDetector" name="%GCCBuiltinSpecsDetector.name" - parameter="${COMMAND} ${FLAGS} ${cross_toolchain_flags} -E -P -v -dD "${INPUTS}"" + parameter="${COMMAND} ${ALL_FLAGS} ${cross_toolchain_flags} -E -P -v -dD "${INPUTS}"" prefer-non-shared="true">