Correct libc path

[openwrt/svn-archive/archive.git] / scripts / remote-gdb

diff --git a/scripts/remote-gdb b/scripts/remote-gdb
index 95529fc84c4992563843162f9a12eccb8aa50887..49cdd1e22c5a8180fe9184d66a7306d0d0cd52ab 100755 (executable)
--- a/scripts/remote-gdb
+++ b/scripts/remote-gdb
@@ -14,7 +14,7 @@ if( opendir SD, "$Bin/../staging_dir" )
 {
        my ( $tid, $arch, $libc, @arches );
 
-       if( $ARGV[1] =~ m!\btarget-([^_/]+)_([^_/]+)\b! )
+       if( $ARGV[1] =~ m!\btarget-(.+?)_([^_]+libc[^_/]+)\b!i )
        {
                print("Using target $1 ($2)\n");
                ($arch, $libc) = ($1, $2);
@@ -52,8 +52,7 @@ if( opendir SD, "$Bin/../staging_dir" )
        closedir SD;
 
        # Find gdb
-       my ($gdb) = glob("$Bin/../staging_dir/toolchain-${arch}_*_${libc}/bin/*-gdb");
-
+       my ($gdb) = glob("$Bin/../staging_dir/toolchain-${arch}_*_${libc}*/bin/*-gdb");
        if( defined($gdb) && -x $gdb )
        {
                my ( $fh, $fp ) = tempfile();