phant0mas pushed a commit to branch master
in repository guix.
commit 484437bd438ccaf7efa673edc26aee80d2fc7bf0
Author: Manolis Ragkousis <[email protected]>
Date: Mon Jan 2 14:05:31 2017 +0200
guix: build: make-bootstrap: Copy libpthread_nonshared.a to the new system.
* guix/build/make-bootstrap.scm (%libc-object-files-rx): Update regexp.
---
guix/build/make-bootstrap.scm | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/guix/build/make-bootstrap.scm b/guix/build/make-bootstrap.scm
index bc4c0e3..21c78cc 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 <[email protected]>
+;;; Copyright © 2015, 2017 Manolis Fragkiskos Ragkousis <[email protected]>
;;; Copyright © 2015 Ludovic Courtès <[email protected]>
;;;
;;; 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")))
