{
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
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);
}
}