06/07: gnu: binutils-mesboot0: parameterize architecture

[guix-commits]

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

commit dac195c8f1494e2703449498ca0b2c58c1e4b105
Author: Efraim Flashner <efraim@flashner.co.il>
AuthorDate: Tue Dec 13 14:03:38 2022 +0200

    gnu: binutils-mesboot0: parameterize architecture
---
 gnu/packages/commencement.scm | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/gnu/packages/commencement.scm b/gnu/packages/commencement.scm
index 4c183260d2..e6c5dfd47c 100644
--- a/gnu/packages/commencement.scm
+++ b/gnu/packages/commencement.scm
@@ -1359,16 +1359,21 @@ ac_cv_c_float_format='IEEE (little-endian)'
     (name "binutils-mesboot1")
     (native-inputs (%boot-mesboot0-inputs))
     (arguments
+     (let ((triplet (match (%current-system)
+                           ((or "armhf-linux" "aarch64-linux")
+                            "arm-unknown-linux-gnu")
+                           ((or "i686-linux" "x86_64-linux")
+                            "i686-unknown-linux-gnu"))))
      (substitute-keyword-arguments (package-arguments binutils-mesboot0)
        ((#:configure-flags configure-flags)
         '(let ((out (assoc-ref %outputs "out")))
            `("--disable-nls"
              "--disable-shared"
              "--disable-werror"
-             "--build=i686-unknown-linux-gnu"
-             "--host=i686-unknown-linux-gnu"
+             ,(string-append "--build=" #$triplet)
+             ,(string-append "--host=" #$triplet)
              "--with-sysroot=/"
-             ,(string-append "--prefix=" out))))))))
+             ,(string-append "--prefix=" out)))))))))
 
 (define gnu-make-mesboot
   (package