diff options
| author | Manolis Ragkousis <manolis837@gmail.com> | 2017-01-02 14:05:31 +0200 |
|---|---|---|
| committer | Manolis Ragkousis <manolis837@gmail.com> | 2017-01-03 16:00:43 +0200 |
| commit | 484437bd438ccaf7efa673edc26aee80d2fc7bf0 (patch) | |
| tree | d723fcdf8e02240b9cd880dd2abf5d0319fbf439 | |
| parent | 367f701379d6d4fb88acbbf021785195c5345273 (diff) | |
| download | guix-484437bd438ccaf7efa673edc26aee80d2fc7bf0.tar guix-484437bd438ccaf7efa673edc26aee80d2fc7bf0.tar.gz | |
guix: build: make-bootstrap: Copy libpthread_nonshared.a to the new system.
* guix/build/make-bootstrap.scm (%libc-object-files-rx): Update regexp.
| -rw-r--r-- | guix/build/make-bootstrap.scm | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/guix/build/make-bootstrap.scm b/guix/build/make-bootstrap.scm index bc4c0e3d5f..21c78cc8f5 100644 --- a/guix/build/make-bootstrap.scm +++ b/guix/build/make-bootstrap.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2015 Manolis Fragkiskos Ragkousis <manolis837@gmail.com> +;;; Copyright © 2015, 2017 Manolis Fragkiskos Ragkousis <manolis837@gmail.com> ;;; Copyright © 2015 Ludovic Courtès <ludo@gnu.org> ;;; ;;; This file is part of GNU Guix. @@ -64,7 +64,8 @@ when producing a bootstrap libc." #t)) (define %libc-object-files-rx "^(crt.*|ld.*|lib(c|m|dl|rt|pthread|nsl|\ -util).*\\.so(\\..*)?|lib(machuser|hurduser).so.*|libc(rt|)_nonshared\\.a)$") +util).*\\.so(\\..*)?|lib(machuser|hurduser).so.*|(libc(rt|)|libpthread)\ +_nonshared\\.a)$") (setvbuf (current-output-port) _IOLBF) (let* ((libdir (string-append output "/lib"))) |