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

mescc: Guile fixes.

Browse source 
* scripts/mescc: Set GODIR.  Add module as expression to Mes
  invokation.  Remove explicit (second) call to main.
This commit is contained in:
Jan Nieuwenhuizen 2018-05-04 10:12:34 +02:00
parent 95fdfb2261
commit 62bd70cfb6
No known key found for this signature in database
GPG key ID: F3C1A0D9C1D65273
2 changed files with 3 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
build-aux/check-mescc.sh
View file

@ -213,7 +213,6 @@ broken="$broken
27_sizeof 27_sizeof
28_strings 28_strings
30_hanoi
32_led 32_led
34_array_assignment 34_array_assignment
37_sprintf 37_sprintf
@ -258,7 +257,7 @@ for t in $tests; do
echo ' [SKIP]' echo ' [SKIP]'
continue; continue;
fi fi
sh build-aux/test.sh "scaffold/tinycc/$t" arg1 arg2 arg3 arg4 arg5 &> scaffold/tinycc/"$t".log sh build-aux/test.sh "scaffold/tinycc/$t" &> scaffold/tinycc/"$t".log
r=$? r=$?
total=$((total+1)) total=$((total+1))
if [ $r = 0 ]; then if [ $r = 0 ]; then

6
scripts/mescc
View file

@ -4,7 +4,7 @@ mes_p=$(command -v mes)
if [ '(' -z "$mes_p" -a -z "$MES" ')' -o "$MES" = "guile" -o "$MES" = "mes.guile" ]; then if [ '(' -z "$mes_p" -a -z "$MES" ')' -o "$MES" = "guile" -o "$MES" = "mes.guile" ]; then
GODIR=${GODIR-@GODIR@} GODIR=${GODIR-@GODIR@}
GUILEDIR=${GUILEDIR-@GUILEDIR@} GUILEDIR=${GUILEDIR-@GUILEDIR@}
[ "$GODIR" = @"GODIR"@ ] && GODIR=$(dirname $0) [ "$GODIR" = @"GODIR"@ ] && GODIR=$(dirname $0)/../guile
[ "$GUILEDIR" = @"GUILEDIR"@ ] && GUILEDIR=$(dirname $0)/../guile [ "$GUILEDIR" = @"GUILEDIR"@ ] && GUILEDIR=$(dirname $0)/../guile
export GUILE_AUTO_COMPILE=${GUILE_AUTO_COMPILE-0} export GUILE_AUTO_COMPILE=${GUILE_AUTO_COMPILE-0}
GUILE_LOAD_COMPILED_PATH=$GODIR:$GUILE_LOAD_COMPILED_PATH GUILE_LOAD_COMPILED_PATH=$GODIR:$GUILE_LOAD_COMPILED_PATH
@ -21,7 +21,7 @@ else
fi fi
MES_MODULEDIR=${MES_MODULEDIR-$MES_PREFIX/"module"} MES_MODULEDIR=${MES_MODULEDIR-$MES_PREFIX/"module"}
export MES_MODULEDIR export MES_MODULEDIR
$MES -s $0 "$@" exec ${MES-mes} -e '(mescc)' -s $0 "$@"
exit $? exit $?
fi fi
!# !#
@ -204,6 +204,4 @@ Environment variables:
(objects (map info->object infos))) (objects (map info->object infos)))
(if compile? (objects->M1 file-name objects) (if compile? (objects->M1 file-name objects)
(objects->elf file objects)))))))))) (objects->elf file objects))))))))))
(main (command-line))
'done 'done