diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2023-12-07 22:46:27 +0100 |
|---|---|---|
| committer | Christopher Baines <mail@cbaines.net> | 2024-07-11 10:24:09 +0100 |
| commit | 3c94bcef30675408c2f707700aa02f1d06f30b69 (patch) | |
| tree | cd03ac4f0dbeb3c9684ff8b837d95263b5137b11 /gnu/packages/commencement.scm | |
| parent | e39e67d7b799ba93d074e54dee95f1c171a93dd0 (diff) | |
gnu: glibc: Improve handling of empty .a files.
This partially reverts 3b2de6529b9d77c8a74d431859a3ec334e9603c2, itself
a followup to 25b30622b4a77cd4b2965b9d62fa310a22413d54.
* gnu/packages/base.scm (glibc)[arguments]: In ‘move-static-libs’ phase,
remove ‘empty-static-libraries’ variable and rewrite
‘empty-static-library?’ to check file type and size.
* gnu/packages/commencement.scm (make-gcc-toolchain): Remove ‘copy-file’
call to create ‘librt.a’.
Change-Id: I33c6825d5b1e6e790dfff494bac1da07d3389e77
Diffstat (limited to 'gnu/packages/commencement.scm')
| -rw-r--r-- | gnu/packages/commencement.scm | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/gnu/packages/commencement.scm b/gnu/packages/commencement.scm index d6e8da0f32..179b4f2d3e 100644 --- a/gnu/packages/commencement.scm +++ b/gnu/packages/commencement.scm @@ -3583,15 +3583,7 @@ COREUTILS-FINAL vs. COREUTILS, etc." "libc-debug"))) (union-build (assoc-ref %outputs "static") (list (assoc-ref %build-inputs - "libc-static"))) - ;; XXX Remove once an empty librt.a is added to - ;; libc:out. - (copy-file - (string-append (assoc-ref %outputs "out") - "/lib/libpthread.a") - (string-append (assoc-ref %outputs "out") - "/lib/librt.a")) - #t)))) + "libc-static"))))))) (native-search-paths (append (package-native-search-paths gcc) |