From mboxrd@z Thu Jan 1 00:00:00 1970 From: manolis837@gmail.com Subject: [PATCH] guix: build: make-bootstrap: Copy libpthread_nonshared.a to the new system. Date: Mon, 2 Jan 2017 19:53:21 +0200 Message-ID: <20170102175321.13800-1-manolis837@gmail.com> Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Return-path: Received: from eggs.gnu.org ([2001:4830:134:3::10]:38970) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cO6ng-0005oN-0l for guix-devel@gnu.org; Mon, 02 Jan 2017 12:53:37 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1cO6nc-00047j-VE for guix-devel@gnu.org; Mon, 02 Jan 2017 12:53:36 -0500 Received: from mail-wj0-x241.google.com ([2a00:1450:400c:c01::241]:35893) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1cO6nc-00047d-No for guix-devel@gnu.org; Mon, 02 Jan 2017 12:53:32 -0500 Received: by mail-wj0-x241.google.com with SMTP id j10so69374358wjb.3 for ; Mon, 02 Jan 2017 09:53:32 -0800 (PST) List-Id: "Development of GNU Guix and the GNU System distribution." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-devel-bounces+gcggd-guix-devel=m.gmane.org@gnu.org Sender: "Guix-devel" To: guix-devel@gnu.org From: Manolis Ragkousis * 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 bc4c0e3d5..21c78cc8f 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 +;;; Copyright © 2015, 2017 Manolis Fragkiskos Ragkousis ;;; Copyright © 2015 Ludovic Courtès ;;; ;;; 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"))) -- 2.11.0