-#!/usr/bin/perl
+#!/usr/bin/env perl
use strict;
use warnings;
{
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);
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);
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";