branch wip-hurd updated: squash! Revert "gnu: commencement: static-bash-for-glibc: Hurd build fix."

[guix-commits]

This is an automated email from the git hooks/post-receive script.

janneke pushed a commit to branch wip-hurd
in repository guix.

The following commit(s) were added to refs/heads/wip-hurd by this push:
     new 00fb31d  squash! Revert "gnu: commencement: static-bash-for-glibc: 
Hurd build fix."
00fb31d is described below

commit 00fb31d4b15b723f6846fa2f3610aba6186c0cd3
Author: Jan Nieuwenhuizen <address@hidden>
AuthorDate: Mon Mar 16 10:44:35 2020 +0100

    squash! Revert "gnu: commencement: static-bash-for-glibc: Hurd build fix."
    
    Using gcc-5 as %bootstrap-gcc, this fixup is no longer necessary.
    
    This reverts commit 95b5d15e42e1409f195480f0d3948edca8ce4551.
---
 gnu/packages/commencement.scm | 11 +----------
 1 file changed, 1 insertion(+), 10 deletions(-)

diff --git a/gnu/packages/commencement.scm b/gnu/packages/commencement.scm
index c49f9fa..88016bd 100644
--- a/gnu/packages/commencement.scm
+++ b/gnu/packages/commencement.scm
@@ -3365,16 +3365,7 @@ exec ~a/bin/~a-~a -B~a/lib -Wl,-dynamic-linker -Wl,~a/~a 
\"$@\"~%"
                      (list (string-append "LDFLAGS=-static -L"
                                           (assoc-ref %build-inputs
                                                      "libc:static")
-                                          "/lib"))))
-           ((#:phases phases)
-            `(modify-phases ,phases
-               ,@(if (hurd-system?)
-                     '((add-after 'unpack 'patch-man2html
-                         (lambda _
-                           (substitute* "support/Makefile.in"
-                             (("^LIBS = @LIBS@")
-                              "LIBS = @LIBS@ -lhurduser -lmachuser")))))
-                     '()))))))))
+                                          "/lib")))))))))
 
 (define gettext-boot0
   ;; A minimal gettext used during bootstrap.