shithub: mc

Info  •  Files  •  Log  •  Branches

Fix bootstrap generation code.

	Options shuffled, so the script needs to match. Also,
	I broke the options, so this unbreaks them.

--- a/genbootstrap.sh

+++ b/genbootstrap.sh

@@ -22,7 +22,7 @@

 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 '^	' | \

--- a/mbld/main.myr

+++ b/mbld/main.myr

@@ -32,7 +32,8 @@

 			[.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"],