X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=scripts%2Fremote-gdb;h=a470ac71d24480460301a1460125ba427e947eed;hb=e22926a46bd634bc5693048ed48ebf46121d039f;hp=aad23e3246ad6feb441c9ecbb593f36899f7a1cb;hpb=04c4b01fb4540672f524814bf13328501cf289df;p=oweals%2Fopenwrt.git

diff --git a/scripts/remote-gdb b/scripts/remote-gdb
index aad23e3246..a470ac71d2 100755
--- 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);
@@ -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();