scripts: fix remote-gdb with CONFIG_BUILD_SUFFIX

Fix the scripts/remote-gdb script when CONFIG_BUILD_SUFFIX is set.
CONFIG_BUILD_SUFFIX extends the name of the folder build_dir/target*

Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>

diff --git a/scripts/remote-gdb b/scripts/remote-gdb
index 52306639fcb0772413e8b9d02148fc4b782d580c..efb321c24376c5f886973f9263ff0d813824e4dc 100755 (executable)
--- 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);
@@ -58,7 +58,7 @@ if( opendir SD, "$Bin/../staging_dir" )
                my ( $fh, $fp ) = tempfile();
 
                # Find sysroot
-               my ($sysroot) = glob("$Bin/../staging_dir/target-${arch}_${libc}/root-*/");
+               my ($sysroot) = glob("$Bin/../staging_dir/target-${arch}_${libc}*/root-*/");
 
                print $fh "set sysroot $sysroot\n" if $sysroot;
                my $cmd = "target extended-remote";