[glibc/fw/builtin-syscalls-4] build-many-glibcs.py: Fix “glibcs i686-gnu --strip”

[glibc/fw/builtin-syscalls-4] build-many-glibcs.py: Fix “glibcs i686-gnu --strip”

[Florian Weimer]

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #1: Type: text/plain; charset="us-ascii", Size: 1802 bytes --]

https://sourceware.org/git/gitweb.cgi?p=glibc.git;h=fd391ccb22fbb8db584025c944566a846ac17f9c

commit fd391ccb22fbb8db584025c944566a846ac17f9c
Author: Florian Weimer <fweimer@redhat.com>
Date:   Wed Dec 18 12:02:20 2019 +0100

    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.

Diff:
---
 scripts/build-many-glibcs.py | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/scripts/build-many-glibcs.py b/scripts/build-many-glibcs.py
index e898f97..9cd90d5 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)