Author: jow Date: 2015-01-23 13:41:06 +0100 (Fri, 23 Jan 2015) New Revision: 44088
Modified: trunk/scripts/remote-gdb Log: scripts: remote-gdb: fix target / libc matching on directory names Signed-off-by: Jo-Philipp Wich <[email protected]> Modified: trunk/scripts/remote-gdb =================================================================== --- trunk/scripts/remote-gdb 2015-01-23 12:33:04 UTC (rev 44087) +++ trunk/scripts/remote-gdb 2015-01-23 12:41:06 UTC (rev 44088) @@ -14,7 +14,7 @@ { 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 @@ 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); _______________________________________________ openwrt-commits mailing list [email protected] https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-commits
