diff options
Diffstat (limited to 'tools')
| -rwxr-xr-x | tools/install-xml-file-list | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/tools/install-xml-file-list b/tools/install-xml-file-list index dbe5169a9..f8944ccbd 100755 --- a/tools/install-xml-file-list +++ b/tools/install-xml-file-list @@ -128,7 +128,10 @@ sub collect_needed_libraries { my $to_check = join(' ', @to_check); my @l = `ldd $to_check 2>/dev/null` =~ m! => (/\S+)!g; foreach (@l) { - s!^(/lib(64)?/).*?/!$1! if $main_node->{attr}{'no-arch-libraries'}; #- replace /lib/tls or /lib/i686 with /lib + if ($main_node->{attr}{'no-arch-libraries'}) { + #- replace /lib/i686 with /lib (but keep /lib/tls) + s!^(/lib(64)?/).*?/!$1! if !m!/tls/!; + } } @to_check = grep { !$needed_libraries{$_}++ } @l; @to_check = (); |