gnu: binutils-muslboot0: Fix building on i686-linux.

* gnu/packages/commencement.scm (binutils-muslboot0)[native-inputs]:
When building on i686-linux add binutils-mesboot0.
[arguments]: When building on i686-linux use ranlib.

Change-Id: I0a550a0a65d9923f9ae20cc0f0717a918a433968

1 files changed, 13 insertions, 5 deletions

diff --git a/gnu/packages/commencement.scm b/gnu/packages/commencement.scm
index 515fcef3892..6d1b4a88b69 100644
--- a/gnu/packages/commencement.scm
+++ b/gnu/packages/commencement.scm
@@ -1175,9 +1175,15 @@ MesCC-Tools), and finally M2-Planet.")
     (inputs '())
     (propagated-inputs '())
     (native-inputs
-     (modify-inputs (package-native-inputs tcc-musl)
-                    (replace "tcc" tcc-musl)
-                    (replace "bash" oksh-muslboot0)))
+     ;; It seems we need ranlib on some architectures.
+     (if (target-x86?)
+         (modify-inputs (package-native-inputs tcc-musl)
+                        (replace "tcc" tcc-musl)
+                        (replace "bash" oksh-muslboot0)
+                        (prepend binutils-mesboot0))
+         (modify-inputs (package-native-inputs tcc-musl)
+                        (replace "tcc" tcc-musl)
+                        (replace "bash" oksh-muslboot0))))
     (arguments
      (list #:implicit-inputs? #f
            #:guile %bootstrap-guile
@@ -1208,9 +1214,11 @@ MesCC-Tools), and finally M2-Planet.")
                "CFLAGS=-g"
                "CC=tcc"
                "LD=tcc"
-               "AR=tcc -ar"
+               #$@(if (target-x86?)
+                      #~("AR=ar")
+                      #~("AR=tcc -ar"
+                         "RANLIB=true"))
                "MAKEINFO=true"
-               "RANLIB=true"
                "--enable-64-bit-bfd"
                "--disable-nls"
                "--disable-shared"