12/60: gnu: gcc-core-mesboot0: Use commencement-build-target.

[guix-commits]

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

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

    gnu: gcc-core-mesboot0: Use commencement-build-target.
    
    * gnu/packages/commencement.scm (gcc-core-mesboot0)[arguments]: Adjust
    the configure-flags and build phase to use commencement-build-target.
    [native-search-paths]: Use commencement-build-target.
    
    Change-Id: Ic147d914f45e1a5dd61fd93223792859e51264cb
---
 gnu/packages/commencement.scm | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/gnu/packages/commencement.scm b/gnu/packages/commencement.scm
index 65c9b2ada9..f522fb8b98 100644
--- a/gnu/packages/commencement.scm
+++ b/gnu/packages/commencement.scm
@@ -943,8 +943,8 @@ MesCC-Tools), and finally M2-Planet.")
                `("--enable-static"
                  "--disable-shared"
                  "--disable-werror"
-                 "--build=i686-unknown-linux-gnu"
-                 "--host=i686-unknown-linux-gnu"
+                 ,(string-append "--build=" #$(commencement-build-target))
+                 ,(string-append "--host=" #$(commencement-build-target))
                  ,(string-append "--prefix=" out)))
            #:make-flags
            #~`("CC=tcc -static -D __GLIBC_MINOR__=6"
@@ -1001,10 +1001,10 @@ ac_cv_c_float_format='IEEE (little-endian)'
                (add-after 'install 'install2
                  (lambda* (#:key outputs #:allow-other-keys)
                    (let* ((tcc (assoc-ref %build-inputs "tcc"))
-                          (tcc-lib (string-append tcc "/lib/x86-mes-gcc"))
                           (out (assoc-ref outputs "out"))
                           (gcc-dir (string-append
-                                    out 
"/lib/gcc-lib/i686-unknown-linux-gnu/2.95.3")))
+                                    out "/lib/gcc-lib/" 
#$(commencement-build-target)
+                                    "/2.95.3")))
                      (mkdir-p "tmp")
                      (with-directory-excursion "tmp"
                        (invoke "ar" "x" (string-append "../gcc/libgcc2.a"))
@@ -1021,10 +1021,10 @@ ac_cv_c_float_format='IEEE (little-endian)'
     (native-search-paths
      (list (search-path-specification
             (variable "C_INCLUDE_PATH")
-            (files '("include"
+            (files `("include"
 
                      ;; Needed to get things like GCC's <stddef.h>.
-                     "lib/gcc-lib/i686-unknown-linux-gnu/2.95.3/include")))
+                     "lib/gcc-lib/" ,(commencement-build-target) 
"/2.95.3/include")))
            (search-path-specification
             (variable "LIBRARY_PATH")
             (files '("lib")))))))