18/92: gnu: gcc-mesboot: Use commencement-build-target.

[guix-commits]

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

commit 03f3150336e142bf271905e5f9724666b1852478
Author: Efraim Flashner <efr...@flashner.co.il>
AuthorDate: Tue Oct 1 08:20:16 2024 +0300

    gnu: gcc-mesboot: Use commencement-build-target.
    
    * gnu/packages/commencement.scm (gcc-mesboot)[arguments]: Adjust the
    configure-flags and 'setenv phase to use commencement-build-target.
    
    Change-Id: I7f864963dd5c08b878dda29188741707b3016edd
---
 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 5b6252ef7a..d88f2b0502 100644
--- a/gnu/packages/commencement.scm
+++ b/gnu/packages/commencement.scm
@@ -1783,8 +1783,8 @@ exec " gcc "/bin/" program
             #~(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))
 
                       "--with-host-libstdcxx=-lsupc++"
 
@@ -1833,12 +1833,16 @@ exec " gcc "/bin/" program
                            (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/4.6.4/include"
+                                                gcc "/lib/gcc-lib/"
+                                                #$(commencement-build-target)
+                                                "/4.6.4/include"
                                                 ":" kernel-headers "/include"
                                                 ":" glibc "/include"
                                                 ":" (getcwd) "/mpfr/src"))
                       (setenv "CPLUS_INCLUDE_PATH" (string-append
-                                                    gcc 
"/lib/gcc-lib/i686-unknown-linux-gnu/4.6.4/include"
+                                                    gcc "/lib/gcc-lib/"
+                                                    
#$(commencement-build-target)
+                                                    "/4.6.4/include"
                                                     ":" kernel-headers 
"/include"
                                                     ":" glibc "/include"
                                                     ":" (getcwd) "/mpfr/src"))