20/60: gnu: gcc-mesboot1-wrapper: Correctly target more systems.

[guix-commits]

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

commit 1c0a3bf80727dd4a99b38edec5712c7c96f50c99
Author: Efraim Flashner <efraim@flashner.co.il>
AuthorDate: Tue Oct 1 11:53:11 2024 +0300

    gnu: gcc-mesboot1-wrapper: Correctly target more systems.
    
    * gnu/packages/commencement.scm (gcc-mesboot1-wrapper)[arguments]:
    Adjust the 'build phase to correctly target more architectures.
    
    Change-Id: I26ed5d329d7b3c80d74edd27acf4f2865928db7b
---
 gnu/packages/commencement.scm | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/gnu/packages/commencement.scm b/gnu/packages/commencement.scm
index e967eb7c74..9b52974a3c 100644
--- a/gnu/packages/commencement.scm
+++ b/gnu/packages/commencement.scm
@@ -1724,8 +1724,9 @@ SHELL := " shell "
                         (display (string-append "#! " bash "/bin/bash
 exec " gcc "/bin/" program
 " -Wl,--dynamic-linker"
-;; also for x86_64-linux, we are still on i686-linux
-" -Wl," libc ,(glibc-dynamic-linker "i686-linux")
+" -Wl," libc ,(glibc-dynamic-linker
+                (gnu-triplet->nix-system
+                  (commencement-build-target)))
 " -Wl,--rpath"
 " -Wl," libc "/lib"
 " \"$@\"
@@ -1734,9 +1735,9 @@ exec " gcc "/bin/" program
                 '("cpp"
                   "gcc"
                   "g++"
-                  "i686-unknown-linux-gnu-cpp"
-                  "i686-unknown-linux-gnu-gcc"
-                  "i686-unknown-linux-gnu-g++")))))
+                  ,(string-append (commencement-build-target) "-cpp")
+                  ,(string-append (commencement-build-target) "-gcc")
+                  ,(string-append (commencement-build-target) "-g++"))))))
          (replace 'check
            (lambda* (#:key outputs #:allow-other-keys)
              (let* ((out (assoc-ref outputs "out"))