build: src/mes build fixes.

* build-aux/GNUmakefile.in (seed): Add dependency on gcc.
* build-aux/build-cc.sh: Copy result to src/mes.
* build-aux/build-cc32.sh: Likewise.
* build-aux/build.sh.in: Remove copying of results.

diff --git a/build-aux/GNUmakefile.in b/build-aux/GNUmakefile.in
index 8965b9256a91c18f6e7db36437ca39a41cfd4cc7..bd313f7bbe1e53da82ee477717d2265214900d9c 100644 (file)
--- a/build-aux/GNUmakefile.in
+++ b/build-aux/GNUmakefile.in
@@ -145,7 +145,7 @@ install:
 uninstall:
        ./uninstall.sh
 
-seed: all-go mes-gcc mes-tcc
+seed: all-go gcc mes-gcc mes-tcc
        cd $(MES_SEED) && git reset --hard HEAD
        MES=$(GUILE) GUILE=$(GUILE) SEED=1 ${srcdest}build-aux/build-mes.sh
        cd $(MES_SEED) && MES_PREFIX=$(PWD) ./refresh.sh

diff --git a/build-aux/build-cc.sh b/build-aux/build-cc.sh
index 4ef6b4744d41f8e1dea937966c7053bbf79352aa..d94c9e33ccb3eca2a60d47204bf66feaee438d31 100755 (executable)
--- a/build-aux/build-cc.sh
+++ b/build-aux/build-cc.sh
@@ -69,3 +69,4 @@ sh ${srcdest}build-aux/cc64-mes.sh scaffold/tiny-mes
 sh ${srcdest}build-aux/cc64-mes.sh scaffold/mini-mes
 
 sh ${srcdest}build-aux/cc64-mes.sh src/mes
+cp src/mes.gcc-out src/mes

diff --git a/build-aux/build-cc32.sh b/build-aux/build-cc32.sh
index 6f2385c9089e9c0dc9939903d80bc1bd7866f5de..792496c7259f3349667846337084380542e6d0f4 100755 (executable)
--- a/build-aux/build-cc32.sh
+++ b/build-aux/build-cc32.sh
@@ -66,3 +66,9 @@ sh ${srcdest}build-aux/cc32-mes.sh scaffold/tiny-mes
 sh ${srcdest}build-aux/cc32-mes.sh scaffold/mini-mes
 
 sh ${srcdest}build-aux/cc32-mes.sh src/mes
+
+if [ "$CC32" = "$TCC" ]; then
+    cp src/mes.mes-tcc-out src/mes
+else
+    cp src/mes.mes-gcc-out src/mes
+fi

diff --git a/build-aux/build.sh.in b/build-aux/build.sh.in
index 461a6509f4bb1da72c3dff06076797453636db37..4d3b6df98372183ef66fc0d5d79affb6b4b1fc97 100755 (executable)
--- a/build-aux/build.sh.in
+++ b/build-aux/build.sh.in
@@ -37,17 +37,14 @@ fi
 
 if [ -n "$CC" ]; then
     sh ${srcdest}build-aux/build-cc.sh
-    cp src/mes.gcc-out src/mes
 fi
 
 if [ -n "$CC32" ]; then
     sh ${srcdest}build-aux/build-cc32.sh
-    cp src/mes.mes-gcc-out src/mes
 fi
 
 if [ -n "$TCC" ]; then
     CC32=$TCC sh ${srcdest}build-aux/build-cc32.sh
-    cp src/mes.mes-tcc-out src/mes
 fi
 
 sh ${srcdest}build-aux/build-mes.sh