AA: scripts: backport r34118

SVN-Revision: 34119

diff --git a/scripts/remote-gdb b/scripts/remote-gdb
index 49cdd1e22c5a8180fe9184d66a7306d0d0cd52ab..a470ac71d24480460301a1460125ba427e947eed 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-(.+?)_([^_]+libc[^_/]+)\b!i )
+       if( $ARGV[1] =~ m!\btarget-(.+?)_([^_]+libc[^/]+)\b!i )
        {
                print("Using target $1 ($2)\n");
                ($arch, $libc) = ($1, $2);
@@ -26,7 +26,7 @@ if( opendir SD, "$Bin/../staging_dir" )
 
                while( defined( my $e = readdir SD ) )
                {
-                       if( -d "$Bin/../staging_dir/$e" && $e =~ /^target-(.+?)_([^_]+libc[^_]+)/i )
+                       if( -d "$Bin/../staging_dir/$e" && $e =~ /^target-(.+?)_([^_]+libc.+)/i )
                        {
                                push @arches, [ $1, $2 ];
                                printf(" %2d) %s (%s)\n", @arches + 0, $1, $2);