summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOri Bernstein <ori@eigenstate.org>2015-12-29 01:55:18 -0800
committerOri Bernstein <ori@eigenstate.org>2015-12-29 01:55:18 -0800
commit2088041377729498bfa0b4fc5720b020051025d8 (patch)
tree548ad96aa0a22848d4ba243c446e4cc1b2810e79
parent3e4e102ff2989a630710122c8d28858ba1504463 (diff)
downloadmc-2088041377729498bfa0b4fc5720b020051025d8.tar.gz
Fix bootstrap generation code.
Options shuffled, so the script needs to match. Also, I broke the options, so this unbreaks them.
-rwxr-xr-xgenbootstrap.sh2
-rw-r--r--mbld/main.myr3
2 files changed, 3 insertions, 2 deletions
diff --git a/genbootstrap.sh b/genbootstrap.sh
index e344ccc..b07aefe 100755
--- a/genbootstrap.sh
+++ b/genbootstrap.sh
@@ -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 -Rnone mbld:mbld | \
+./xmbld -Bnone mbld:mbld | \
sed "s:^\\(.*\\)/[^/]*\.\.\.: cd \$pwd/\\1:g" | \
sed "s:`pwd`:\$pwd:g" | \
grep '^ ' | \
diff --git a/mbld/main.myr b/mbld/main.myr
index 2a147c9..30ef52a 100644
--- a/mbld/main.myr
+++ b/mbld/main.myr
@@ -32,7 +32,8 @@ const main = {args : byte[:][:]
[.opt='S', .desc="generate assembly when building"],
[.opt='d', .desc="dump debugging information for mbld"],
[.opt='I', .arg="inc", .desc="add 'inc' to your include path"],
- [.opt='R', .arg="root", .desc="install into 'root'"],
+ [.opt='R', .arg="runsrc", .desc="source to compile and run"],
+ [.opt='B', .arg="base", .desc="install into 'base'"],
[.opt='b', .arg="bin", .desc="compile binary named 'bin' from inputs"],
[.opt='G', .arg="bin", .desc="compile and run binary 'bin' from inputs"],
[.opt='l', .arg="lib", .desc="compile lib named 'lib' from inputs"],