From d8e6046453c1fbd8cd6ed7928e700ad891a57851 Mon Sep 17 00:00:00 2001
From: Jan Nieuwenhuizen <janneke@gnu.org>
Date: Sat, 16 Jun 2018 06:37:20 +0200
Subject: [PATCH] build: make seed: Update mescc-tools-seed too.

---
 GNUmakefile | 12 ++++++++++++
 configure   | 19 +++++++++++--------
 2 files changed, 23 insertions(+), 8 deletions(-)

diff --git a/GNUmakefile b/GNUmakefile
index 12aa936c..1bc2c095 100644
--- a/GNUmakefile
+++ b/GNUmakefile
@@ -48,6 +48,14 @@ seed: all-go
 	MES=$(GUILE) GUILE=$(GUILE) SEED=1 build-aux/build-mes.sh
 	cd $(MES_SEED) && MES_PREFIX=$(PWD) ./refresh.sh
 	MES=$(GUILE) GUILE=$(GUILE) SEED=1 build-aux/build-mes.sh
+	cp lib/x86-mes/elf32-header.hex2\
+           lib/x86-mes/x86.M1\
+           lib/x86-mes/libc+tcc.S\
+           lib/x86-mes/libc.S\
+           lib/x86-mes/crt1.S\
+           lib/x86-mes/libgetopt.S\
+           $(MESCC_TOOLS_SEED)/libs
+	cd $(MESCC_TOOLS_SEED) && MES_PREFIX=$(PWD) ./bootstrap.sh
 
 define HELP_TOP
 Usage: make [OPTION]... [TARGET]...
@@ -136,6 +144,10 @@ ifdef MES_SEED
 export MES_SEED
 endif
 
+ifdef MESCC_TOOLS_SEED
+export MESCC_TOOLS_SEED
+endif
+
 ifdef TINYCC_SEED
 export TINYCC_SEED
 endif
diff --git a/configure b/configure
index 33b5afae..5a9750bb 100755
--- a/configure
+++ b/configure
@@ -216,14 +216,15 @@ Installation directories:
   --sysconfdir=DIR     read-only single-machine data [PREFIX/etc]
 
 Some influential environment variables:
-  CC          C compiler command
-  CFLAGS      C compiler flags
-  CC32        x86 C compiler command
-  C32FLAGS    x86 C compiler flags
-  GUILE       guile command
-  GUILE_TOOLS guile-tools command
-  MES_SEED    location of mes-seed
-  TINYCC_SEED location of tinycc-seed
+  CC                C compiler command
+  CFLAGS            C compiler flags
+  CC32              x86 C compiler command
+  C32FLAGS          x86 C compiler flags
+  GUILE             guile command
+  GUILE_TOOLS       guile-tools command
+  MES_SEED          location of mes-seed
+  MESCC_TOOLS_SEED  location of mescc-tools-seed
+  TINYCC_SEED       location of tinycc-seed
 " PACKAGE VERSION (getenv "PREFIX")))
 
 (define (main args)
@@ -254,6 +255,7 @@ Some influential environment variables:
           (M1FLAGS (getenv "M1FLAGS"))
           (MESCCFLAGS (getenv "MESCCFLAGS"))
           (MES_SEED (or (getenv "MES_SEED") "../mes-seed"))
+          (MESCC_TOOLS_SEED (or (getenv "MESCC_TOOLS_SEED") "../mescc-tools-seed"))
           (TINYCC_SEED (or (getenv "TINYCC_SEED") "../tinycc-seed")))
       (when help?
         (print-help)
@@ -298,6 +300,7 @@ Some influential environment variables:
           (stdout "CC32:=~a\n" (or CC32 ""))
           (stdout "BLOOD_ELF:=~a\n" (or BLOOD_ELF ""))
           (stdout "MES_SEED:=~a\n" (or MES_SEED ""))
+          (stdout "MESCC_TOOLS_SEED:=~a\n" (or MESCC_TOOLS_SEED ""))
           (stdout "TINYCC_SEED:=~a\n" (or TINYCC_SEED ""))
           (stdout "HEX2:=~a\n" (or HEX2 ""))
           (stdout "M1:=~a\n" (or M1 ""))