EljakimHerrewijnen/Openwrt
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix handling of BUILD_SUFFIX in remote-gdb script

Browse Source 
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 <thomas.langer@intel.com>
This commit is contained in:
Thomas Langer 2019-08-22 12:21:14 +00:00 committed by Hauke Mehrtens
parent 413c68d120
commit 035906fd05
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
scripts/remote-gdb
View File

@ -14,9 +14,9 @@ if( opendir SD, "$Bin/../staging_dir" )
{ {
my ( $tid, $arch, $libc, @arches ); 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); ($arch, $libc) = ($1, $2);
} }
else else
@ -26,10 +26,10 @@ if( opendir SD, "$Bin/../staging_dir" )
while( defined( my $e = readdir SD ) ) 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 ]; push @arches, [ $1, $2 ];
printf(" %2d) %s (%s)\n", @arches + 0, $1, $2); printf(" %2d) %s (%s %s)\n", @arches + 0, $1, $2, $3);
} }
} }