From f55c29e4c74353ef0795eb83911c708c6db90466 Mon Sep 17 00:00:00 2001 From: Felix Fietkau Date: Tue, 7 Feb 2017 10:33:10 +0100 Subject: build: remove libc version suffix from build/staging directories Our supported libcs are ABI compatible across version upgrades Signed-off-by: Felix Fietkau --- scripts/remote-gdb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'scripts/remote-gdb') diff --git a/scripts/remote-gdb b/scripts/remote-gdb index efb321c243..99c9d386d3 100755 --- 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); @@ -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); -- cgit v1.2.3