161/163: gnu: make-boot0: Set LOADLIBES for i686-linux.

[Jan Nieuwenhuizen]

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

commit 8e1977169c1bdb1236c147c93bdfe2ac77c91bd5
Author: Jan Nieuwenhuizen <address@hidden>
Date:   Tue Aug 28 23:12:59 2018 +0200

    gnu: make-boot0: Set LOADLIBES for i686-linux.
    
    * gnu/packages/commencement.scm (gnu-make-boot0): Set LOADLIBES for 
i686-linux.
---
 gnu/packages/commencement.scm | 28 ++++++++++++++++++----------
 1 file changed, 18 insertions(+), 10 deletions(-)

diff --git a/gnu/packages/commencement.scm b/gnu/packages/commencement.scm
index 6779502..7cc1ef9 100644
--- a/gnu/packages/commencement.scm
+++ b/gnu/packages/commencement.scm
@@ -1398,16 +1398,24 @@ ac_cv_c_float_format='IEEE (little-endian)'
         ,@(substitute-keyword-arguments (package-arguments gnu-make)
             ((#:phases phases)
              `(modify-phases ,phases
-                (replace 'build
-                  (lambda _
-                    (invoke "./build.sh")
-                    #t))
-                (replace 'install
-                  (lambda* (#:key outputs #:allow-other-keys)
-                    (let* ((out (assoc-ref outputs "out"))
-                           (bin (string-append out "/bin")))
-                      (install-file "make" bin)
-                      #t))))))))
+                ,@(append
+                   (match (%current-system)
+                     ("i686-linux"
+                      '((add-before 'build 'configure-fixup
+                          (lambda _
+                            (substitute* "build.sh"
+                              (("^LOADLIBES=.*") "LOADLIBES='-ldl -lc 
-lnss_files -lnss_dns -lresolv'\n"))))))
+                     (_ '()))
+                   '((replace 'build
+                       (lambda _
+                         (invoke "./build.sh")
+                         #t))
+                     (replace 'install
+                       (lambda* (#:key outputs #:allow-other-keys)
+                         (let* ((out (assoc-ref outputs "out"))
+                                (bin (string-append out "/bin")))
+                           (install-file "make" bin)
+                           #t))))))))))
      (native-inputs '())                ; no need for 'pkg-config'
      (inputs %bootstrap-inputs+toolchain))))