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

build: Support make seed for x86_64.

Browse source 
* build-aux/GNUmakefile.in (seed): Support make seed for x86_64.
* build-aux/build-mes.sh[SEED]: Also build src/mes.S.
* build-aux/build-x86_64-mes.sh[SEED]: Also build src/mes.x86_64-mes.S.
This commit is contained in:
Jan Nieuwenhuizen 2018-10-06 22:26:07 +02:00
parent b31d431b5d
commit a238986e43
No known key found for this signature in database
GPG key ID: F3C1A0D9C1D65273
4 changed files with 13 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
build-aux/GNUmakefile.in
View file

@ -151,7 +151,7 @@ install:
uninstall: uninstall:
./uninstall.sh ./uninstall.sh
seed: all-go gcc mes-gcc mes-tcc seed: all-go gcc mes-gcc x86_64-mes-gcc mes-tcc
cd $(MES_SEED) && git reset --hard HEAD cd $(MES_SEED) && git reset --hard HEAD
$(MAKE) MES=guile MES_SEED= SEED=1 mes $(MAKE) MES=guile MES_SEED= SEED=1 mes
cp -v lib/x86-mes/*.S $(MES_SEED)/x86-mes cp -v lib/x86-mes/*.S $(MES_SEED)/x86-mes
@ -160,6 +160,7 @@ seed: all-go gcc mes-gcc mes-tcc
cp -v lib/x86_64-mes/*.S $(MES_SEED)/x86_64-mes cp -v lib/x86_64-mes/*.S $(MES_SEED)/x86_64-mes
cp -v src/mes.x86_64-mes-S $(MES_SEED)/x86_64-mes/mes.S cp -v src/mes.x86_64-mes-S $(MES_SEED)/x86_64-mes/mes.S
MES=$(GUILE) GUILE=$(GUILE) SEED=1 MES_SEED= ${srcdest}build-aux/build-mes.sh MES=$(GUILE) GUILE=$(GUILE) SEED=1 MES_SEED= ${srcdest}build-aux/build-mes.sh
MES=$(GUILE) GUILE=$(GUILE) SEED=1 MES_SEED= ${srcdest}build-aux/build-x86_64-mes.sh
cd $(MES_SEED) && MES_PREFIX=$(PWD) ./refresh.sh cd $(MES_SEED) && MES_PREFIX=$(PWD) ./refresh.sh
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) arch=x86_64-mes ./refresh.sh cd $(MES_SEED) && MES_PREFIX=$(PWD) arch=x86_64-mes ./refresh.sh

9
build-aux/build-mes.sh
View file

@ -127,9 +127,6 @@ ARCHDIR=1 NOLINK=1 bash ${srcdest}build-aux/cc-mes.sh lib/libc+tcc
ARCHDIR=1 NOLINK=1 bash ${srcdest}build-aux/cc-mes.sh lib/libc+gnu ARCHDIR=1 NOLINK=1 bash ${srcdest}build-aux/cc-mes.sh lib/libc+gnu
ARCHDIR=1 NOLINK=1 bash ${srcdest}build-aux/cc-mes.sh lib/libgetopt ARCHDIR=1 NOLINK=1 bash ${srcdest}build-aux/cc-mes.sh lib/libgetopt
[ -n "$SEED" ] && exit 0
MES_ARENA=${MES_ARENA-100000000} MES_ARENA=${MES_ARENA-100000000}
trace "SNARF.mes gc.c" ./pre-inst-env bash ${srcdest}build-aux/mes-snarf.scm --mes src/gc.c trace "SNARF.mes gc.c" ./pre-inst-env bash ${srcdest}build-aux/mes-snarf.scm --mes src/gc.c
trace "SNARF.mes lib.c" ./pre-inst-env bash ${srcdest}build-aux/mes-snarf.scm --mes src/lib.c trace "SNARF.mes lib.c" ./pre-inst-env bash ${srcdest}build-aux/mes-snarf.scm --mes src/lib.c
@ -139,8 +136,10 @@ trace "SNARF.mes posix.c" ./pre-inst-env bash ${srcdest}build-aux/mes-snarf.sc
trace "SNARF.mes reader.c" ./pre-inst-env bash ${srcdest}build-aux/mes-snarf.scm --mes src/reader.c trace "SNARF.mes reader.c" ./pre-inst-env bash ${srcdest}build-aux/mes-snarf.scm --mes src/reader.c
trace "SNARF.mes vector.c" ./pre-inst-env bash ${srcdest}build-aux/mes-snarf.scm --mes src/vector.c trace "SNARF.mes vector.c" ./pre-inst-env bash ${srcdest}build-aux/mes-snarf.scm --mes src/vector.c
echo MES_ARENA=$MES_ARENA if [ -n "$SEED" ]; then
bash ${srcdest}build-aux/cc-mes.sh scaffold/main bash ${srcdest}build-aux/cc-mes.sh src/mes
exit 0
fi
MES_LIBS='-l none' bash ${srcdest}build-aux/cc-mes.sh scaffold/main MES_LIBS='-l none' bash ${srcdest}build-aux/cc-mes.sh scaffold/main

9
build-aux/build-x86_64-mes.sh
View file

@ -129,9 +129,6 @@ ARCHDIR=1 NOLINK=1 bash ${srcdest}build-aux/cc-x86_64-mes.sh lib/libc+tcc
ARCHDIR=1 NOLINK=1 bash ${srcdest}build-aux/cc-x86_64-mes.sh lib/libc+gnu ARCHDIR=1 NOLINK=1 bash ${srcdest}build-aux/cc-x86_64-mes.sh lib/libc+gnu
ARCHDIR=1 NOLINK=1 bash ${srcdest}build-aux/cc-x86_64-mes.sh lib/libgetopt ARCHDIR=1 NOLINK=1 bash ${srcdest}build-aux/cc-x86_64-mes.sh lib/libgetopt
[ -n "$SEED" ] && exit 0
MES_ARENA=${MES_ARENA-100000000} MES_ARENA=${MES_ARENA-100000000}
trace "SNARF.mes gc.c" ./pre-inst-env bash ${srcdest}build-aux/mes-snarf.scm --mes src/gc.c trace "SNARF.mes gc.c" ./pre-inst-env bash ${srcdest}build-aux/mes-snarf.scm --mes src/gc.c
trace "SNARF.mes lib.c" ./pre-inst-env bash ${srcdest}build-aux/mes-snarf.scm --mes src/lib.c trace "SNARF.mes lib.c" ./pre-inst-env bash ${srcdest}build-aux/mes-snarf.scm --mes src/lib.c
@ -141,8 +138,10 @@ trace "SNARF.mes posix.c" ./pre-inst-env bash ${srcdest}build-aux/mes-snarf.sc
trace "SNARF.mes reader.c" ./pre-inst-env bash ${srcdest}build-aux/mes-snarf.scm --mes src/reader.c trace "SNARF.mes reader.c" ./pre-inst-env bash ${srcdest}build-aux/mes-snarf.scm --mes src/reader.c
trace "SNARF.mes vector.c" ./pre-inst-env bash ${srcdest}build-aux/mes-snarf.scm --mes src/vector.c trace "SNARF.mes vector.c" ./pre-inst-env bash ${srcdest}build-aux/mes-snarf.scm --mes src/vector.c
echo MES_ARENA=$MES_ARENA if [ -n "$SEED" ]; then
bash ${srcdest}build-aux/cc-x86_64-mes.sh scaffold/main bash ${srcdest}build-aux/cc-mes.sh src/mes
exit 0
fi
MES_LIBS='-l none' bash ${srcdest}build-aux/cc-x86_64-mes.sh scaffold/main MES_LIBS='-l none' bash ${srcdest}build-aux/cc-x86_64-mes.sh scaffold/main

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

@ -53,4 +53,6 @@ if [ -n "$TCC" ]; then
fi fi
sh ${srcdest}build-aux/build-mes.sh sh ${srcdest}build-aux/build-mes.sh
sh ${srcdest}build-aux/build-x86_64-mes.sh if [ "$MES" = guile ]; then
sh ${srcdest}build-aux/build-x86_64-mes.sh
fi