projects
/
openwrt
/
staging
/
blogic.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
706b6b8
)
remote-gdb: * use sysroot instead of solib search paths * don't query arch if there...
author
Jo-Philipp Wich
<jow@openwrt.org>
Thu, 18 Mar 2010 21:10:56 +0000
(21:10 +0000)
committer
Jo-Philipp Wich
<jow@openwrt.org>
Thu, 18 Mar 2010 21:10:56 +0000
(21:10 +0000)
SVN-Revision: 20290
scripts/remote-gdb
patch
|
blob
|
history
diff --git
a/scripts/remote-gdb
b/scripts/remote-gdb
index 9701b31c152325ac5e659cb3720ac5740fc93a01..60efb9703fc8d4239da3611d6a2e5ded2d5cd6d1 100755
(executable)
--- a/
scripts/remote-gdb
+++ b/
scripts/remote-gdb
@@
-33,13
+33,20
@@
if( opendir SD, "$Bin/../staging_dir" )
}
}
}
}
- # Query arch
- do {
- print("Target? > ");
- chomp($tid = <STDIN>);
- } while( !defined($tid) || $tid !~ /^\d+$/ || $tid < 1 || $tid > @arches );
+ if( @arches > 1 )
+ {
+ # Query arch
+ do {
+ print("Target? > ");
+ chomp($tid = <STDIN>);
+ } while( !defined($tid) || $tid !~ /^\d+$/ || $tid < 1 || $tid > @arches );
- ($arch, $libc) = @{$arches[$tid-1]};
+ ($arch, $libc) = @{$arches[$tid-1]};
+ }
+ else
+ {
+ ($arch, $libc) = @{$arches[0]};
+ }
}
closedir SD;
}
closedir SD;
@@
-47,18
+54,14
@@
if( opendir SD, "$Bin/../staging_dir" )
# Find gdb
my ($gdb) = glob("$Bin/../build_dir/toolchain-${arch}_*_${libc}/gdb-*/gdb/gdb");
# Find gdb
my ($gdb) = glob("$Bin/../build_dir/toolchain-${arch}_*_${libc}/gdb-*/gdb/gdb");
- if( -x $gdb )
+ if(
defined($gdb) &&
-x $gdb )
{
my ( $fh, $fp ) = tempfile();
{
my ( $fh, $fp ) = tempfile();
- # Find library paths
- my $libdirs = join ':', (
- glob("$Bin/../staging_dir/target-${arch}_${libc}/root-*/{,usr/}lib/"),
- glob("$Bin/../staging_dir/target-${arch}_${libc}/{,usr/}lib/"),
- glob("$Bin/../staging_dir/toolchain-${arch}_*_${libc}/lib/")
- );
+ # Find sysroot
+ my ($sysroot) = glob("$Bin/../staging_dir/target-${arch}_${libc}/root-*/");
- print $fh "set s
olib-search-path $libdirs\n"
;
+ print $fh "set s
ysroot $sysroot\n" if $sysroot
;
print $fh "target remote $ARGV[0]\n";
system($gdb, '-x', $fp, $ARGV[1]);
print $fh "target remote $ARGV[0]\n";
system($gdb, '-x', $fp, $ARGV[1]);