aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThomas Langer <thomas.langer@intel.com>2019-08-22 12:21:14 +0000
committerHauke Mehrtens <hauke@hauke-m.de>2019-09-01 18:38:05 +0200
commit035906fd05b2e5543cedd9471731043945fdcf13 (patch)
treee3aa33b034ee6993915134aeecbf70ab5e741432
parent413c68d120043cd8ff1f4aa057d33c140bfc6bfa (diff)
downloadupstream-035906fd05b2e5543cedd9471731043945fdcf13.tar.gz
upstream-035906fd05b2e5543cedd9471731043945fdcf13.tar.bz2
upstream-035906fd05b2e5543cedd9471731043945fdcf13.zip
Fix handling of BUILD_SUFFIX in remote-gdb script
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>
-rwxr-xr-xscripts/remote-gdb8
1 files changed, 4 insertions, 4 deletions
diff --git a/scripts/remote-gdb b/scripts/remote-gdb
index 99c9d386d3..d8e2336d0e 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);
}
}