20/70: bootstrap: mes-boot: Install intermediate ASCII cache.

[guix-commits]

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

commit 6f3bd283ce7ad88597cff9145ec9098bd111bbed
Author: Jan Nieuwenhuizen <address@hidden>
Date:   Mon Dec 9 16:08:06 2019 +0100

    bootstrap: mes-boot: Install intermediate ASCII cache.
    
    mes-boot should have the well known mes-rb5 sha256sum, but it's different,
    possibly due to usage of mescc-tools 0.5.2.  We keep the build cache to
    enable comparison later.
    
    * gnu/packages/commencement.scm (mes-boot): Install intermediate ASCII 
cache.
---
 gnu/packages/commencement.scm | 18 +++++++++++++++++-
 1 file changed, 17 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/commencement.scm b/gnu/packages/commencement.scm
index 57d7957..a7d8473 100644
--- a/gnu/packages/commencement.scm
+++ b/gnu/packages/commencement.scm
@@ -509,6 +509,7 @@ $MES -e '(mescc)' module/mescc.scm -- \"$@\"
                  (invoke "tar" "-xvf" nyacc-source)))))
          (add-after 'unpack 'patch-%moduledir
            (lambda _
+             (copy-file "module/mescc.scm" "module/mescc.scm.orig")
              (substitute* "module/mescc.scm"
                (("^  \\(mes-use-module \\(mescc mescc\\)" all)
                 (string-append "
@@ -561,7 +562,21 @@ $MES -e '(mescc)' module/mescc.scm -- \"$@\"
                (("^( *)((cp|mkdir|tar) [^']*[^\\])\n" all space cmd)
                 (string-append space "echo '" cmd "'\n"
                                space cmd "\n")))
-             (invoke "sh" "install.sh"))))))
+             (copy-file "module/mescc.scm.orig" "module/mescc.scm")
+             (invoke "sh" "install.sh")
+             ;; Keep ASCII output, for friendlier comparison and bisection
+             (let* ((out (assoc-ref %outputs "out"))
+                    (cache (string-append out "/lib/cache")))
+               (define (objects-in-dir dir)
+                 (find-files dir
+                             (lambda (name stat)
+                               (and (equal? (dirname name) dir)
+                                    (or (string-suffix? ".o" name)
+                                        (string-suffix? ".s" name))))))
+               (for-each (lambda (x) (install-file x cache))
+                         (append (objects-in-dir ".")
+                                 (objects-in-dir "mescc-lib"))))
+             #t)))))
     (native-search-paths
      (list (search-path-specification
             (variable "C_INCLUDE_PATH")
@@ -571,6 +586,7 @@ $MES -e '(mescc)' module/mescc.scm -- \"$@\"
             (files '("lib")))
            (search-path-specification
             (variable "MES_PREFIX")
+            (separator #f)
             (files '("")))))))