diff options
| author | Doug Schaefer | 2016-05-25 15:21:22 +0000 |
|---|---|---|
| committer | Gerrit Code Review @ Eclipse.org | 2016-06-14 01:23:10 +0000 |
| commit | 5d2cbaaa1c59b45ad44e486d2f876dd8100b1045 (patch) | |
| tree | fb2d369ac9d24a2e3fe6b04f9dcc1e95add46a71 /dsf-gdb | |
| parent | de37ec61db93ec9c55cd3102ef2f2bb8d2f854c9 (diff) | |
| download | org.eclipse.cdt-5d2cbaaa1c59b45ad44e486d2f876dd8100b1045.tar.gz org.eclipse.cdt-5d2cbaaa1c59b45ad44e486d2f876dd8100b1045.tar.xz org.eclipse.cdt-5d2cbaaa1c59b45ad44e486d2f876dd8100b1045.zip | |
Cherry picking changes from the CDT 9 branch for Qt and Arduino.
Change-Id: I85eca2b8bb0447d4dd703030c41d90c1f9bcdf89
Diffstat (limited to 'dsf-gdb')
2 files changed, 8 insertions, 9 deletions
diff --git a/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/gdb/launching/GdbLaunch.java b/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/gdb/launching/GdbLaunch.java index 721546dd345..a76718afb93 100644 --- a/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/gdb/launching/GdbLaunch.java +++ b/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/gdb/launching/GdbLaunch.java @@ -32,6 +32,7 @@ import java.util.concurrent.RejectedExecutionException; import org.eclipse.cdt.core.CCorePlugin; import org.eclipse.cdt.core.cdtvariables.CdtVariableException; import org.eclipse.cdt.core.cdtvariables.ICdtVariable; +import org.eclipse.cdt.core.cdtvariables.ICdtVariableManager; import org.eclipse.cdt.core.envvar.IEnvironmentVariable; import org.eclipse.cdt.core.model.CoreModel; import org.eclipse.cdt.core.model.ICProject; @@ -660,19 +661,17 @@ public class GdbLaunch extends DsfLaunch implements ITerminate, IDisconnect, ITr } // Add variables from build info - ICdtVariable[] buildVars = CCorePlugin.getDefault().getCdtVariableManager().getVariables(cfg); + ICdtVariableManager manager = CCorePlugin.getDefault().getCdtVariableManager(); + ICdtVariable[] buildVars = manager.getVariables(cfg); for (ICdtVariable var : buildVars) { try { // The project_classpath variable contributed by JDT is - // useless - // for running C/C++ - // binaries, but it can be lethal if it has a very large - // value - // that exceeds shell - // limit. See + // useless for running C/C++ binaries, but it can be lethal + // if it has a very large value that exceeds shell limit. See // http://bugs.eclipse.org/bugs/show_bug.cgi?id=408522 if (!"project_classpath".equals(var.getName())) {//$NON-NLS-1$ - envMap.put(var.getName(), var.getStringValue()); + String value = manager.resolveValue(var.getStringValue(), "", File.pathSeparator, cfg); //$NON-NLS-1$ + envMap.put(var.getName(), value); } } catch (CdtVariableException e) { // Some Eclipse dynamic variables can't be resolved diff --git a/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/gdb/launching/GdbLaunchDelegate.java b/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/gdb/launching/GdbLaunchDelegate.java index 7534f18c347..12b987b8326 100644 --- a/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/gdb/launching/GdbLaunchDelegate.java +++ b/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/gdb/launching/GdbLaunchDelegate.java @@ -139,7 +139,7 @@ public class GdbLaunchDelegate extends AbstractCLaunchDelegate2 monitor.worked(1); - String gdbVersion = getGDBVersion(config); + String gdbVersion = launch.getGDBVersion(); // First make sure non-stop is supported, if the user want to use this mode if (LaunchUtils.getIsNonStopMode(config) && !isNonStopSupportedInGdbVersion(gdbVersion)) { |