13/20: REMOVEME Use %bootstrap-guile for tcc-boot0-next.

[guix-commits]

janneke pushed a commit to branch wip-arm-bootstrap
in repository guix.

commit b382db702b5f202492bf75c85cc473183aa4ea85
Author: Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
AuthorDate: Wed Dec 16 17:26:20 2020 +0100

    REMOVEME Use %bootstrap-guile for tcc-boot0-next.
    
    XXX This speeds-up the build.
    
    * gnu/packages/commencement.scm (tcc-boot0-next)[native-inputs]: Add
    %bootstrap-guile.
    [arguments]: Use it instead of Mes.
---
 gnu/packages/commencement.scm | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/gnu/packages/commencement.scm b/gnu/packages/commencement.scm
index a0ec03e..b059456 100644
--- a/gnu/packages/commencement.scm
+++ b/gnu/packages/commencement.scm
@@ -741,6 +741,7 @@ $MES -e '(mescc)' module/mescc.scm -- \"$@\"
     (propagated-inputs '())
     (native-inputs
      `(("mes" ,mes-boot-next)
+       ("guile" ,%bootstrap-guile) ;; HACK: use Guile
        ("nyacc-source" ,(origin (inherit (package-source nyacc-1.00.2))
                                 (snippet #f)))
        ("mescc-tools" ,%bootstrap-mescc-tools)
@@ -764,6 +765,11 @@ $MES -e '(mescc)' module/mescc.scm -- \"$@\"
                     (interpreter "/lib/mes-loader")
                     (mes (assoc-ref inputs "mes"))
                     (mescc (string-append mes "/bin/mescc")))
+               (when #t ;; HACK: use Guile
+                 (setenv "MES" "guile")
+                 (setenv "GUILE_LOAD_PATH"
+                         (string-append mes "/share/mes/module"
+                                        ":" dir "/nyacc-1.00.2/module")))
                (substitute* "conftest.c"
                  (("volatile") ""))
                (setenv "prefix" out)
@@ -779,6 +785,7 @@ $MES -e '(mescc)' module/mescc.scm -- \"$@\"
                (("^( *)((cp|ls|mkdir|rm|[.]/tcc|[.]/[$][{program_prefix[}]tcc) 
[^\"]*[^\\])\n" all space cmd)
                 (string-append space "echo \"" cmd "\"\n"
                                space cmd "\n")))
+             (setenv "V" "2")
              (invoke "sh" "bootstrap.sh")))
          (replace 'check
            (lambda _