diff options
| author | Florian Weimer <fweimer@redhat.com> | 2019-12-18 12:02:20 +0100 |
|---|---|---|
| committer | Florian Weimer <fweimer@redhat.com> | 2019-12-31 11:44:47 +0100 |
| commit | fd391ccb22fbb8db584025c944566a846ac17f9c (patch) | |
| tree | e73d5e04fd8a27a3d8fd1d83ab948ef9c9ebfb9e | |
| parent | da48ae8f5c7983c118befcf121235235fedaad56 (diff) | |
| download | glibc-fw/builtin-syscalls-4.tar.gz | |
build-many-glibcs.py: Fix “glibcs i686-gnu --strip”fw/builtin-syscalls-4
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.
| -rwxr-xr-x | scripts/build-many-glibcs.py | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/scripts/build-many-glibcs.py b/scripts/build-many-glibcs.py index e898f979c5..9cd90d5101 100755 --- a/scripts/build-many-glibcs.py +++ b/scripts/build-many-glibcs.py @@ -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) |