01/01: gnu: mescc-tools-boot: Update to bootstrap from M1 binaries.

[Jan Nieuwenhuizen]

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

commit 9a51ae332ff7297020e8f692e413820f7b38a472
Author: Jan Nieuwenhuizen <address@hidden>
Date:   Wed Nov 29 23:32:02 2017 +0100

    gnu: mescc-tools-boot: Update to bootstrap from M1 binaries.
    
    Mescc-tools now bootstrap from M1.M1 and hex2.M1 sources using the binaries
    produced from those sources.  That means with this commit we reduced our
    binary seed from two ~650Kb gcc-compiled binaries (hex2 and M1) to a
    47Kb binary (hex2) and a 73Kb binary (M1), both of which can be reproduced
    by their hex2.M1 and M1.M1 ascii seeds.
    
    These .M1 ascii seeds are still not source; they are produced by mescc
    compiled from hex2_linker.c and M1-macro.c.
    
    * gnu/packages/mes.scm (mescc-tools-boot): Remove MORTAL SIN of installing
    gcc-compiled M1.
---
 gnu/packages/mes.scm | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/gnu/packages/mes.scm b/gnu/packages/mes.scm
index 3828e01..a81f05e 100644
--- a/gnu/packages/mes.scm
+++ b/gnu/packages/mes.scm
@@ -110,7 +110,7 @@ with a Knight VM that runs Forth and Lisp.")
 (define-public mescc-tools-boot
   (let ((version "0.2")
         (revision "0")
-        (commit "3882f30b62b73c7005408fc2dccc82280e79b659"))
+        (commit "ba44d19a830d03bc87a24241a268ae097b654f3d"))
     (package-with-bootstrap-guile
      (package
        (name "mescc-tools-boot")
@@ -124,7 +124,7 @@ with a Knight VM that runs Forth and Lisp.")
                  (file-name (string-append name "-" version ".tar.xz"))
                  (sha256
                   (base32
-                   "0hrc18dshwp9bbimckj9inx04zxnw4a2m5hq3vkyw8hab8jyd2gw"))))
+                   "0dcvlacks67ks9ibzcqhq82fg0j2g69cxznb6xl5c99m1qrdvl57"))))
        (native-inputs
         `(("static-bash" ,@(assoc-ref %bootstrap-inputs "bash"))
           ("bash" ,(search-bootstrap-binary "bash" (%current-system)))
@@ -188,10 +188,7 @@ with a Knight VM that runs Forth and Lisp.")
               (setenv "MES_SEED" "../mes-seed")
               (and (zero? (system* "sh" "build.sh"))
                    (zero? (system* "sh" "check.sh"))
-                   (zero? (system* "sh" "install.sh"))
-                   ;; FIXME: MORTAL SIN HERE
-                   ;; M1 cannot be bootstrapped yet
-                   (copy-file "../mescc-tools-seed/M1" (string-append out 
"/bin/M1")))))))
+                   (zero? (system* "sh" "install.sh")))))))
        (description
         "Mescc-tools is a collection of tools for use in a full source
 bootstrapping process.  Currently consists of the M1 macro assembler and the