shithub: MicroHs

Info  •  Files  •  Log  •  Branches

MacOS portability fixes.

--- a/Tools/mhsc.sh

+++ b/Tools/mhsc.sh

@@ -15,8 +15,8 @@

 compflags=""

 output=""

-while [ `expr substr "X$1" 1 2` = "X-" ]; do

-    if [ `expr substr "$1" 1 2` = "-o" ]; then

+while [ `expr "X$1" : "X-"` = "2" ]; do

+    if [ `expr "$1" : "-o"` = "2" ]; then

         output="$1"

     else

         compflags="$compflags $1"

@@ -35,10 +35,11 @@

 compress="$compile -r $lib -i$prefixmhs/Tools Compress"

 addcomb="$compile -r $lib -i$prefixmhs/Tools Addcombs"

-tmpcomb=`mktemp -t comb.XXXXXX`

-tmpeval=`mktemp -t eval.XXXXXX.c`

+tmp=${TMPDIR:=/tmp}

+tmpcomb=`mktemp -t $tmp comb.XXXXXX`

+tmpeval=`mktemp -t $tmp eval.XXXXXX.c`

-trap "rm -f $tmpcomb $tmpeval" EXIT

+##trap "rm -f $tmpcomb $tmpeval" EXIT

 ex=""

 $ex $compile $lib $compflags -o$tmpcomb "$input"

@@ -45,4 +46,4 @@

 $ex cp $prefixmhs/src/runtime/eval.c $tmpeval

 $ex $compress < $tmpcomb | $addcomb >> $tmpeval

 $ex $cc -O3 $tmpeval $output

-$ex rm -f $tmpcomb $tmpeval

+##$ex rm -f $tmpcomb $tmpeval

--- a/src/runtime/eval.c

+++ b/src/runtime/eval.c

@@ -316,8 +316,9 @@

 }

 void

-closeb_buf(BFILE *)

+closeb_buf(BFILE *bp)

 {

+  (void)bp;                     /* shut up warning */

 }

 /*** BFILE via FILE ***/

-- 

⑨