X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/ad903bf464948e03c76b4145c99f9f2bb6e9c06a..51f0f920a86889afc951135cf7421131a7496202:/scripts/remote-gdb

diff --git a/scripts/remote-gdb b/scripts/remote-gdb
index 95529fc84..49cdd1e22 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-([^_/]+)_([^_/]+)\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();