artemist/mes
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

build: src/mes build fixes.

Browse source 
* 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.
This commit is contained in:
Jan Nieuwenhuizen 2018-08-12 15:05:21 +02:00
parent 9273a64098
commit 43f0c2d831
No known key found for this signature in database
GPG key ID: F3C1A0D9C1D65273
4 changed files with 8 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
build-aux/GNUmakefile.in
View file

@ -145,7 +145,7 @@ install:
uninstall: uninstall:
./uninstall.sh ./uninstall.sh
seed: all-go mes-gcc mes-tcc seed: all-go gcc mes-gcc mes-tcc
cd $(MES_SEED) && git reset --hard HEAD cd $(MES_SEED) && git reset --hard HEAD
MES=$(GUILE) GUILE=$(GUILE) SEED=1 ${srcdest}build-aux/build-mes.sh MES=$(GUILE) GUILE=$(GUILE) SEED=1 ${srcdest}build-aux/build-mes.sh
cd $(MES_SEED) && MES_PREFIX=$(PWD) ./refresh.sh cd $(MES_SEED) && MES_PREFIX=$(PWD) ./refresh.sh

1
build-aux/build-cc.sh
View file

@ -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 scaffold/mini-mes
sh ${srcdest}build-aux/cc64-mes.sh src/mes sh ${srcdest}build-aux/cc64-mes.sh src/mes
cp src/mes.gcc-out src/mes

6
build-aux/build-cc32.sh
View file

@ -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 scaffold/mini-mes
sh ${srcdest}build-aux/cc32-mes.sh src/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

3
build-aux/build.sh.in
View file

@ -37,17 +37,14 @@ fi
if [ -n "$CC" ]; then if [ -n "$CC" ]; then
sh ${srcdest}build-aux/build-cc.sh sh ${srcdest}build-aux/build-cc.sh
cp src/mes.gcc-out src/mes
fi fi
if [ -n "$CC32" ]; then if [ -n "$CC32" ]; then
sh ${srcdest}build-aux/build-cc32.sh sh ${srcdest}build-aux/build-cc32.sh
cp src/mes.mes-gcc-out src/mes
fi fi
if [ -n "$TCC" ]; then if [ -n "$TCC" ]; then
CC32=$TCC sh ${srcdest}build-aux/build-cc32.sh CC32=$TCC sh ${srcdest}build-aux/build-cc32.sh
cp src/mes.mes-tcc-out src/mes
fi fi
sh ${srcdest}build-aux/build-mes.sh sh ${srcdest}build-aux/build-mes.sh