build-many-glibcs.py: Fix “glibcs i686-gnu --strip”

Hurd uses an empty prefix, so the linker scripts end up in /lib, the
find command picked them up, and stripping them failed because they
are not ELF files.
This commit is contained in:
Florian Weimer 2020-01-02 10:18:42 +01:00
parent 0933a4678c
commit cc47d5c5f5
1 changed files with 9 additions and 4 deletions

View File

@ -1483,10 +1483,15 @@ class GlibcPolicyForBuild(GlibcPolicyDefault):
def extra_commands(self, cmdlist):
if self.strip:
cmdlist.add_command('strip',
['sh', '-c',
('%s $(find %s/lib* -name "*.so")' %
(self.strip, self.installdir))])
# Avoid picking up libc.so and libpthread.so, which are
# linker scripts stored in /lib on Hurd. libc and
# libpthread are still stripped via their libc-X.YY.so
# implementation files.
find_command = (('find %s/lib* -name "*.so"'
+ r' \! -name libc.so \! -name libpthread.so')
% self.installdir)
cmdlist.add_command('strip', ['sh', '-c', ('%s $(%s)' %
(self.strip, find_command))])
cmdlist.add_command('check', ['make', 'check'])
cmdlist.add_command('save-logs', [self.save_logs], always_run=True)