X-Git-Url: http://git.openwrt.org/?a=blobdiff_plain;f=scripts%2Fremote-gdb;h=d8e2336d0e98aee171fdff1ccffd4b71141633b4;hb=18622638831707038556b9b8bd5a0b4d4a53ce53;hp=ce96dd2c436ce29d2e4ac818384a5e31658a0c9b;hpb=c399f986899e9fc311c4c6a3870fc16770941a1c;p=openwrt%2Fopenwrt.git

diff --git a/scripts/remote-gdb b/scripts/remote-gdb
index ce96dd2c43..d8e2336d0e 100755
--- a/scripts/remote-gdb
+++ b/scripts/remote-gdb
@@ -1,4 +1,4 @@
-#!/usr/bin/perl
+#!/usr/bin/env perl
 
 use strict;
 use warnings;
@@ -14,9 +14,9 @@ if( opendir SD, "$Bin/../staging_dir" )
 {
 	my ( $tid, $arch, $libc, @arches );
 
-	if( $ARGV[1] =~ m!\btarget-(.+?)_(([^_]+libc|musl)[^/]+)\b!i )
+	if( $ARGV[1] =~ m!\btarget-(.+?)_([^/_]+libc|musl)_?([^/]*).*\b!i )
 	{
-		print("Using target $1 ($2)\n");
+		print("Using target $1 ($2, $3)\n");
 		($arch, $libc) = ($1, $2);
 	}
 	else
@@ -26,10 +26,10 @@ if( opendir SD, "$Bin/../staging_dir" )
 
 		while( defined( my $e = readdir SD ) )
 		{
-			if( -d "$Bin/../staging_dir/$e" && $e =~ /^target-(.+?)_(([^_]+.libc|musl)+)/i )
+			if( -d "$Bin/../staging_dir/$e" && $e =~ /^target-(.+?)_([^\/_]+libc|musl)_?([^\/]*).*/i )
 			{
 				push @arches, [ $1, $2 ];
-				printf(" %2d) %s (%s)\n", @arches + 0, $1, $2);
+				printf(" %2d) %s (%s %s)\n", @arches + 0, $1, $2, $3);
 			}
 		}
 
@@ -58,7 +58,7 @@ if( opendir SD, "$Bin/../staging_dir" )
 		my ( $fh, $fp ) = tempfile();
 
 		# Find sysroot
-		my ($sysroot) = glob("$Bin/../staging_dir/target-${arch}_${libc}/root-*/");
+		my ($sysroot) = glob("$Bin/../staging_dir/target-${arch}_${libc}*/root-*/");
 
 		print $fh "set sysroot $sysroot\n" if $sysroot;
 		my $cmd = "target extended-remote";