From 4283758d1f3e180fd04da0334c811ea41db92db2 Mon Sep 17 00:00:00 2001 From: malc Date: Sun, 8 Apr 2018 22:46:36 +0300 Subject: [PATCH] Try.. try again --- build.sh | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/build.sh b/build.sh index 3d1ce02..19104df 100755 --- a/build.sh +++ b/build.sh @@ -46,7 +46,7 @@ bocaml1() { keycmd="sum $o $s" grep -q "$o" $outd/ordered || { echo "$o" >>$outd/ordered - isfresh "$o" '$cmd$keymd' || { + isfresh "$o" '$cmd$(eval $keycmd)' || { printf "%*.s%s -> %s\n" $n '' "${s#$srcd/}" "$o" eval "$cmd" echo "k='$cmd$(eval $keycmd)'" >$o.past @@ -77,7 +77,7 @@ bocamlc() { muinc="-I $mudir/include -I $mudir/thirdparty/freetype/include" cmd="ocamlc -ccopt \"-O2 $muinc -o $o\" $s" keycmd="sum $o $s 2>/dev/null" - isfresh "$o" '$cmd$keycmd' || { + isfresh "$o" '$cmd$(eval $keycmd)' || { printf "%s -> %s\n" "${s#$srcd/}" "$o" eval "$cmd" echo "k='$cmd$(eval $keycmd)'" >$o.past @@ -107,7 +107,7 @@ EOF ver=$(cd $srcd && git describe --tags) || echo unknown cmd="mkhelp >$outd/help.ml" keycmd="sum $srcd/KEYS; echo $ver" -isfresh "$outd/help.ml" '$cmd$keycmd$ver' || { +isfresh "$outd/help.ml" '$cmd$(eval keycmd)$ver' || { eval $cmd echo "k='$cmd$(eval $keycmd)'" >$outd/help.ml.past } @@ -129,7 +129,7 @@ ord=$(echo $(eval grep -v \.cmi $outd/ordered)) cmd="ocamlc -custom $libs -o $outd/llpp $ord" cmd="$cmd $globjs $outd/link.o -cclib \"$clibs\"" keycmd='sum $outd/llpp $ord' -isfresh "$outd/llpp" '$cmd$keycmd' || { +isfresh "$outd/llpp" "$cmd$(eval $keycmd)" || { echo linking $outd/llpp eval $cmd echo "k='$cmd$(eval $keycmd)'" >$outd/llpp.past -- 2.11.4.GIT