build: remove libc version suffix from build/staging directories

Our supported libcs are ABI compatible across version upgrades

Signed-off-by: Felix Fietkau <nbd@nbd.name>
This commit is contained in:
Felix Fietkau
2017-02-07 10:33:10 +01:00
parent fa85060698
commit f55c29e4c7
2 changed files with 3 additions and 4 deletions

View File

@ -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);
@ -26,7 +26,7 @@ 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);