summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOri Bernstein <ori@eigenstate.org>2017-07-24 23:56:09 -0700
committerOri Bernstein <ori@eigenstate.org>2017-07-24 23:56:09 -0700
commit83f5a273a751b9053d67798faa0876fbc7ca6a14 (patch)
treec1955e1c28c0af30df3393cf7897ef4a1fc26013
parent2c2e2bca76d1e8263e5b673c4ac652373d0b629b (diff)
downloadmc-83f5a273a751b9053d67798faa0876fbc7ca6a14.tar.gz
Fix bootstrap generation.
Grab mbld from the right place.
-rwxr-xr-xgenbootstrap.sh6
1 files changed, 3 insertions, 3 deletions
diff --git a/genbootstrap.sh b/genbootstrap.sh
index a610e8e..7ce0fbf 100755
--- a/genbootstrap.sh
+++ b/genbootstrap.sh
@@ -12,7 +12,7 @@ else
fi
./mbldwrap.sh
-cp mbld/mbld xmbld
+cp obj/mbld/mbld xmbld
./xmbld clean
# The generated shell script should be a compatible bourne
@@ -22,7 +22,7 @@ echo '#!/bin/sh' > $bootscript
echo '# This script is generated by genbootstrap.sh' >> $bootscript
echo '# to regenerate, run "make bootstrap"' >> $bootscript
echo 'pwd=`pwd`' >> $bootscript
-./xmbld -Bnone mbld:mbld | \
+./xmbld -j1 -Bnone mbld:mbld | \
sed "s:^\\(.*\\)/[^/]*\.\.\.: cd \$pwd/\\1:g" | \
sed "s:`pwd`:\$pwd:g" | \
grep '^ ' | \
@@ -30,4 +30,4 @@ echo 'pwd=`pwd`' >> $bootscript
tee -a $bootscript
echo 'true' >> $bootscript
chmod +x $bootscript
-rm ./xmbld
+#rm ./xmbld