From: Thomas Langer <[email protected]> When CONFIG_BUILD_SUFFIX is enabled, the target-* folders in build_dir and staging_dir have this suffix in the name, but not the toolchain directories. When detecting the names for "arch" and "libc", also accept the suffix and do not use it for the toolchain path.
Signed-off-by: Thomas Langer <[email protected]> diff --git a/scripts/remote-gdb b/scripts/remote-gdb index 99c9d38..d8e2336 100755 --- a/scripts/remote-gdb +++ b/scripts/remote-gdb @@ -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); } } _______________________________________________ openwrt-devel mailing list [email protected] https://lists.openwrt.org/mailman/listinfo/openwrt-devel
