From: Jo-Philipp Wich <jow@openwrt.org>
Date: Fri, 23 Jan 2015 12:41:06 +0000 (+0000)
Subject: scripts: remote-gdb: fix target / libc matching on directory names
X-Git-Tag: reboot~4591
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=9694917416046b948fe6f814073133f13c641f39;p=oweals%2Fopenwrt.git

scripts: remote-gdb: fix target / libc matching on directory names

Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>

SVN-Revision: 44088
---

diff --git a/scripts/remote-gdb b/scripts/remote-gdb
index ce96dd2c43..cd59033e7a 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|musl)[^/]+)\b!i )
+	if( $ARGV[1] =~ m!\btarget-(.+?)_(([^/_]+libc|musl)[^/]+)\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|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);