summaryrefslogtreecommitdiff
path: root/mbldwrap.sh
diff options
context:
space:
mode:
authorOri Bernstein <ori@markovcorp.com>2017-10-05 18:10:43 -0700
committerOri Bernstein <ori@markovcorp.com>2017-10-05 18:10:43 -0700
commitc89a9ad95390793148fd416451ae1d8ebf1d6ae1 (patch)
treec25a8c19c2450161672e9d7acc91651142304fb9 /mbldwrap.sh
parent66e8d816c8cdb09bb175c0145202f100c4b4284c (diff)
downloadmc-c89a9ad95390793148fd416451ae1d8ebf1d6ae1.tar.gz
make the bootstrapping step explicit.
Diffstat (limited to 'mbldwrap.sh')
-rwxr-xr-xmbldwrap.sh15
1 files changed, 7 insertions, 8 deletions
diff --git a/mbldwrap.sh b/mbldwrap.sh
index c1e4655..0983dd6 100755
--- a/mbldwrap.sh
+++ b/mbldwrap.sh
@@ -12,18 +12,17 @@ else
export MYR_MC=6m
export MYR_RT=`pwd`/rt/_myrrt.o
fi
-BOOT="./mk/bootstrap/bootstrap+`uname -s`-`uname -m`.sh"
-MBLD=mbld
if [ -f obj/mbld/mbld ]; then
MBLD=obj/mbld/mbld
elif [ -f mbld/mbld ]; then
MBLD=mbld/mbld
+else
+ MBLD=`which mbld`
fi
-bootstrap() {
- ($BOOT && mbld/mbld $@) || \
- (echo "Unable to run mbld $@; have you build successfully"; exit 1)
-}
-
-$MBLD $@ || bootstrap $@
+if [ -z "$MBLD" ]; then
+ echo 'could not find mbld: did you run "make bootstrap"?'
+else
+ $MBLD $@
+fi