From c928924a21acf9fb2fcadf1942d484b265ad0e07 Mon Sep 17 00:00:00 2001 From: Marc Khouzam Date: Wed, 30 Jul 2008 14:54:21 +0000 Subject: [PATCH] Bug 229288 when using GDB6.6, if the solib-search-path is used, the launch will fail because the -gdb-set sysroot command will fail. The concept of sysroot seems to have been introduced with GDB 6.7 Let's comment it out since it was used only as a safeguard. --- .../launching/FinalLaunchSequence.java | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/plugins/org.eclipse.dd.gdb/src/org/eclipse/dd/gdb/internal/provisional/launching/FinalLaunchSequence.java b/plugins/org.eclipse.dd.gdb/src/org/eclipse/dd/gdb/internal/provisional/launching/FinalLaunchSequence.java index 7e1e4fd191d..bc4a3ffcb83 100644 --- a/plugins/org.eclipse.dd.gdb/src/org/eclipse/dd/gdb/internal/provisional/launching/FinalLaunchSequence.java +++ b/plugins/org.eclipse.dd.gdb/src/org/eclipse/dd/gdb/internal/provisional/launching/FinalLaunchSequence.java @@ -49,7 +49,6 @@ import org.eclipse.dd.mi.service.command.commands.MIGDBSetArgs; import org.eclipse.dd.mi.service.command.commands.MIGDBSetAutoSolib; import org.eclipse.dd.mi.service.command.commands.MIGDBSetNonStop; import org.eclipse.dd.mi.service.command.commands.MIGDBSetSolibSearchPath; -import org.eclipse.dd.mi.service.command.commands.MIGDBSetSysroot; import org.eclipse.dd.mi.service.command.commands.MITargetSelect; import org.eclipse.dd.mi.service.command.commands.RawCommand; import org.eclipse.dd.mi.service.command.output.MIInfo; @@ -282,13 +281,16 @@ public class FinalLaunchSequence extends Sequence { new DataRequestMonitor(getExecutor(), requestMonitor) { @Override protected void handleSuccess() { - // If we are able to set the solib-search-path, - // we should disable the sysroot variable, as indicated - // in the GDB documentation. This is to avoid the sysroot - // variable finding libraries that were not meant to be found. - fCommandControl.queueCommand( - new MIGDBSetSysroot(fCommandControl.getControlDMContext()), - new DataRequestMonitor(getExecutor(), requestMonitor)); +// Sysroot is not available in GDB6.6 and will make the launch fail in that case. +// Let's remove it for now + requestMonitor.done(); +// // If we are able to set the solib-search-path, +// // we should disable the sysroot variable, as indicated +// // in the GDB documentation. This is to avoid the sysroot +// // variable finding libraries that were not meant to be found. +// fCommandControl.queueCommand( +// new MIGDBSetSysroot(fCommandControl.getControlDMContext()), +// new DataRequestMonitor(getExecutor(), requestMonitor)); }; }); } else {