diff options
| author | Jo-Philipp Wich <jow@openwrt.org> | 2015-01-23 12:41:06 +0000 |
|---|---|---|
| committer | Jo-Philipp Wich <jow@openwrt.org> | 2015-01-23 12:41:06 +0000 |
| commit | d2b3101053271ee96e7bfc9705698b0ca8bb2a4a (patch) | |
| tree | 8e5cf45903b9ae7abecafcbaad6df48c650e17ee | |
| parent | dda181d82ca09598c9c1088eb90317c6923dd24f (diff) | |
| download | master-187ad058-d2b3101053271ee96e7bfc9705698b0ca8bb2a4a.tar.gz master-187ad058-d2b3101053271ee96e7bfc9705698b0ca8bb2a4a.tar.bz2 master-187ad058-d2b3101053271ee96e7bfc9705698b0ca8bb2a4a.zip | |
scripts: remote-gdb: fix target / libc matching on directory names
Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@44088 3c298f89-4303-0410-b956-a3cf2f4a3e73
| -rwxr-xr-x | scripts/remote-gdb | 4 |
1 files changed, 2 insertions, 2 deletions
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); |