From 1d03aeebbe3bdf9fd15ad1f5124b079e6710858c Mon Sep 17 00:00:00 2001
From: Jan Nieuwenhuizen <janneke@gnu.org>
Date: Sun, 8 Dec 2019 15:32:51 +0100
Subject: [PATCH] build: Add --with-bootstrap option.

* configure (main): Add --with-bootstrap option.
* build-aux/build.sh.in [--with-bootstrap]: After building mes with CC,
build mes with MesCC.
---
 build-aux/build.sh.in | 3 +++
 configure             | 4 ++++
 2 files changed, 7 insertions(+)

diff --git a/build-aux/build.sh.in b/build-aux/build.sh.in
index a96436ed..a7d81b62 100644
--- a/build-aux/build.sh.in
+++ b/build-aux/build.sh.in
@@ -116,4 +116,7 @@ fi
     LDFLAGS=
     ${SHELL} ${srcdest}build-aux/build-lib.sh
     ${SHELL} ${srcdest}build-aux/build-source-lib.sh
+    if bootstrap; then
+        ${SHELL} ${srcdest}build-aux/build-mes.sh
+    fi
 )
diff --git a/configure b/configure
index e6364c5e..f7ce1347 100755
--- a/configure
+++ b/configure
@@ -304,6 +304,7 @@ MES_ARENA=100000000 exec ${SCHEME-guile} -L . --no-auto-compile -e '(configure)'
             (mes)
             (help (single-char #\h))
             (verbose (single-char #\v))
+            (with-bootstrap)
             (with-cheating)
             (with-courage)
             (infodir (value #t))
@@ -344,6 +345,7 @@ Options:
                        verbose build output [V=1]
       --host=HOST      cross-compile to build programs to run on HOST [BUILD]
   -v, --verbose        be verbose
+  --with-bootstrap     After building mes with CC, build mes with MesCC
   --with-courage       Assert that even if this platform is unsupported,
                        you will be courageous and port GNU Mes to it
                        (see \"Porting GNU Mes\" in the manual.)
@@ -415,6 +417,7 @@ Some influential environment variables:
          (top-builddir (if (equal? srcdir ".") "."
                            abs-top-builddir))
 
+         (with-bootstrap? (option-ref options 'with-bootstrap #f))
          (with-cheating? (option-ref options 'with-cheating #f))
          (with-courage? (option-ref options 'with-courage #f))
          (disable-colors? (option-ref options 'disable-colors #f))
@@ -565,6 +568,7 @@ See \"Porting GNU Mes\" in the manual, or try --with-courage\n" mes-system)
                      ("@build@" . ,build-type)
                      ("@host@" . ,host-type)
 
+                     ("@bootstrap@" . ,(if with-courage? "true" "false"))
                      ("@courageous@" . ,(if with-courage? "true" "false"))
                      ("@compiler@" . ,compiler)
                      ("@mes_bits@" . ,mes-bits)