16/60: gnu: gcc-core-mesboot1: Use commencement-build-target.

[guix-commits]

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

commit 8fe57f7a45d0df1ec65d878e4d45ea4f91728ae1
Author: Efraim Flashner <efraim@flashner.co.il>
AuthorDate: Tue Oct 1 08:17:59 2024 +0300

    gnu: gcc-core-mesboot1: Use commencement-build-target.
    
    * gnu/packages/commencement.scm (gcc-core-mesboot1)[arguments]: Adjust
    the configure-flags, make-flags and 'setenv phase to use
    commencement-build-target.
    
    Change-Id: I6dc04a4aacde08a83f9f5dac3af9c0fabc69d2a7
---
 gnu/packages/commencement.scm | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/gnu/packages/commencement.scm b/gnu/packages/commencement.scm
index d5705dd272..a795ae2823 100644
--- a/gnu/packages/commencement.scm
+++ b/gnu/packages/commencement.scm
@@ -1318,15 +1318,17 @@ ac_cv_c_float_format='IEEE (little-endian)'
                               "-B" libc "/lib "
                               "-Wl,-dynamic-linker "
                               "-Wl," libc
-                              #$(glibc-dynamic-linker "i686-linux"))))
+                              #$(glibc-dynamic-linker
+                                  (gnu-triplet->nix-system
+                                    (commencement-build-target))))))
                (list (string-append "LDFLAGS=" ldflags)
                      (string-append "LDFLAGS_FOR_TARGET=" ldflags)))
            #:configure-flags
            #~(let ((out (assoc-ref %outputs "out"))
                    (glibc (assoc-ref %build-inputs "libc")))
                (list (string-append "--prefix=" out)
-                     "--build=i686-unknown-linux-gnu"
-                     "--host=i686-unknown-linux-gnu"
+                     (string-append "--build=" #$(commencement-build-target))
+                     (string-append "--host=" #$(commencement-build-target))
                      (string-append "--with-native-system-header-dir=" glibc 
"/include")
                      (string-append "--with-build-sysroot=" glibc "/include")
                      "--disable-bootstrap"
@@ -1396,7 +1398,9 @@ ac_cv_c_float_format='IEEE (little-endian)'
                           (kernel-headers (assoc-ref %build-inputs 
"kernel-headers")))
                      (setenv "CONFIG_SHELL" (string-append bash "/bin/sh"))
                      (setenv "C_INCLUDE_PATH" (string-append
-                                               gcc 
"/lib/gcc-lib/i686-unknown-linux-gnu/2.95.3/include"
+                                               gcc "/lib/gcc-lib/"
+                                               #$(commencement-build-target)
+                                               "/2.95.3/include"
                                                ":" kernel-headers "/include"
                                                ":" glibc "/include"
                                                ":" (getcwd) "/mpfr/src"))