diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2024-08-15 16:30:42 +0200 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2024-08-31 10:45:45 +0200 |
| commit | df38aacc02d3a6fb05717430f0d3e3bb43421d9d (patch) | |
| tree | f7206dbd65da17706d02897226de14ac1534355c | |
| parent | 8b6f33a4d9514c1c7fb830829e7ab33472ea1f9c (diff) | |
| download | guix-df38aacc02d3a6fb05717430f0d3e3bb43421d9d.tar.gz guix-df38aacc02d3a6fb05717430f0d3e3bb43421d9d.zip | |
gnu: make-bootstrap: Include libdl.a and libutil.a in ‘glibc-stripped’.
As of glibc 2.39, libdl.so and libutil.so are gone (they are part of
libc proper since 2.34), but empty .a files are provided for backward
compatibility with code using -ldl and -lutil. Keep them.
* guix/build/make-bootstrap.scm (make-stripped-libc)[%libc-object-files-rx]:
Mach libdl.a and libutil.a.
Change-Id: I967c6f34a443366224293362b8a2302fe86fd5a0
| -rw-r--r-- | guix/build/make-bootstrap.scm | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/guix/build/make-bootstrap.scm b/guix/build/make-bootstrap.scm index 6cb5262f8e..287e4db2c7 100644 --- a/guix/build/make-bootstrap.scm +++ b/guix/build/make-bootstrap.scm @@ -110,9 +110,11 @@ when producing a bootstrap libc." (copy-recursively (string-append libc "/include") incdir) (copy-linux-headers output kernel-headers))) + ;; Include *.so, *.so.*, but also empty ar archives provided for backward + ;; compatibility as of libc 2.39: libdl.a and libutil.a. (define %libc-object-files-rx "^(crt.*|ld.*|lib(c|m|dl|rt|pthread|nsl|\ util).*\\.so(\\..*)?|lib(machuser|hurduser).so.*|(libc(rt|)|libpthread)\ -_nonshared\\.a)$") +_nonshared\\.a|lib(dl|util)\\.a)$") (setvbuf (current-output-port) 'line) (let* ((libdir (string-append output "/lib"))) |