ref: 3a9041b78a81f9310fdb48fc3e4a15d5a554814d
parent: 68266464ce4d9d15698cc036862ce1102c66d75e
author: Ori Bernstein <[email protected]>
date: Fri Dec 4 07:27:57 EST 2015
Update bootstrap to new mbld.
--- a/genbootstrap.sh
+++ b/genbootstrap.sh
@@ -23,8 +23,7 @@
echo '# to regenerate, run "make bootstrap"' >> $bootscript
echo 'pwd=`pwd`' >> $bootscript
./xmbld -Rnone mbld:mbld | \
- sed "s:Entering directory '\\(.*\\)': cd \$pwd/\\1:g" | \
- sed "s:Leaving directory.*: cd \$pwd:g" | \
+ sed "s:^\\(.*\\)/[^/]*\.\.\.: cd \$pwd/\\1:g" | \
sed "s:`pwd`:\$pwd:g" | \
grep '^ ' | \
sed 's/.*/echo &;&/' | \
--- a/mk/bootstrap/bootstrap+Darwin-x86_64.sh
+++ b/mk/bootstrap/bootstrap+Darwin-x86_64.sh
@@ -11,7 +11,6 @@
echo as -g -o syscall.o syscall+osx-x64.s ; as -g -o syscall.o syscall+osx-x64.s
echo $pwd/muse/muse -o sys syserrno.use sys.use systypes.use ifreq.use ; $pwd/muse/muse -o sys syserrno.use sys.use systypes.use ifreq.use
echo ar -rcs libsys.a syserrno.o syscall.o util.o sys.o systypes.o ifreq.o ; ar -rcs libsys.a syserrno.o syscall.o util.o sys.o systypes.o ifreq.o
-echo cd $pwd; cd $pwd
echo cd $pwd/lib/std; cd $pwd/lib/std
echo $pwd/6/6m -I ../sys -I . types.myr ; $pwd/6/6m -I ../sys -I . types.myr
echo $pwd/6/6m -I ../sys -I . cstrconv.myr ; $pwd/6/6m -I ../sys -I . cstrconv.myr
@@ -73,6 +72,7 @@
echo $pwd/6/6m -I ../sys -I . strstrip.myr ; $pwd/6/6m -I ../sys -I . strstrip.myr
echo $pwd/6/6m -I ../sys -I . resolve+posixy.myr ; $pwd/6/6m -I ../sys -I . resolve+posixy.myr
echo $pwd/6/6m -I ../sys -I . pathjoin.myr ; $pwd/6/6m -I ../sys -I . pathjoin.myr
+echo $pwd/6/6m -I ../sys -I . slpop.myr ; $pwd/6/6m -I ../sys -I . slpop.myr
echo $pwd/6/6m -I ../sys -I . bitset.myr ; $pwd/6/6m -I ../sys -I . bitset.myr
echo $pwd/6/6m -I ../sys -I . fmtfuncs.myr ; $pwd/6/6m -I ../sys -I . fmtfuncs.myr
echo $pwd/6/6m -I ../sys -I . try.myr ; $pwd/6/6m -I ../sys -I . try.myr
@@ -82,9 +82,8 @@
echo $pwd/6/6m -I ../sys -I . swap.myr ; $pwd/6/6m -I ../sys -I . swap.myr
echo $pwd/6/6m -I ../sys -I . dial+posixy.myr ; $pwd/6/6m -I ../sys -I . dial+posixy.myr
echo as -g -o memops-impl.o memops-impl+posixy-x64.s ; as -g -o memops-impl.o memops-impl+posixy-x64.s
-echo $pwd/muse/muse -o std fmtfuncs.use fmt.use try.use pathjoin.use strjoin.use sljoin.use slpush.use strstrip.use htab.use now.use getcwd.use rand.use dir.use slurp.use varargs.use strbuf.use clear.use slput.use strsplit.use introspect.use alloc.use optparse.use memops.use fltbits.use sldup.use fltfmt.use extremum.use option.use slcp.use errno.use wait.use putint.use syswrap.use sort.use blat.use mk.use swap.use hassuffix.use execvp.use ipparse.use types.use strfind.use utf.use syswrap-ss.use cstrconv.use search.use die.use units.use result.use bitset.use env.use resolve.use intparse.use hasprefix.use mkpath.use getint.use dirname.use sleq.use endian.use spork.use assert.use cmp.use chartype.use bigint.use hashfuncs.use slfill.use fndup.use dial.use ; $pwd/muse/muse -o std fmtfuncs.use fmt.use try.use pathjoin.use strjoin.use sljoin.use slpush.use strstrip.use htab.use now.use getcwd.use rand.use dir.use slurp.use varargs.use strbuf.use clear.use slput.use strsplit.use introspect.use alloc.use optparse.use memops.use fltbits.use sldup.use fltfmt.use extremum.use option.use slcp.use errno.use wait.use putint.use syswrap.use sort.use blat.use mk.use swap.use hassuffix.use execvp.use ipparse.use types.use strfind.use utf.use syswrap-ss.use cstrconv.use search.use die.use units.use result.use bitset.use env.use resolve.use intparse.use hasprefix.use mkpath.use getint.use dirname.use sleq.use endian.use spork.use assert.use cmp.use chartype.use bigint.use hashfuncs.use slfill.use fndup.use dial.use
-echo ar -rcs libstd.a fmtfuncs.o fmt.o try.o pathjoin.o strjoin.o memops-impl.o sljoin.o slpush.o strstrip.o htab.o now.o getcwd.o rand.o dir.o slurp.o varargs.o strbuf.o clear.o slput.o strsplit.o introspect.o alloc.o optparse.o memops.o fltbits.o sldup.o fltfmt.o extremum.o option.o slcp.o errno.o wait.o putint.o syswrap.o sort.o blat.o mk.o swap.o hassuffix.o execvp.o ipparse.o types.o strfind.o utf.o syswrap-ss.o cstrconv.o search.o die.o units.o result.o bitset.o env.o resolve.o intparse.o hasprefix.o mkpath.o getint.o dirname.o sleq.o endian.o spork.o assert.o cmp.o chartype.o bigint.o hashfuncs.o slfill.o fndup.o dial.o ; ar -rcs libstd.a fmtfuncs.o fmt.o try.o pathjoin.o strjoin.o memops-impl.o sljoin.o slpush.o strstrip.o htab.o now.o getcwd.o rand.o dir.o slurp.o varargs.o strbuf.o clear.o slput.o strsplit.o introspect.o alloc.o optparse.o memops.o fltbits.o sldup.o fltfmt.o extremum.o option.o slcp.o errno.o wait.o putint.o syswrap.o sort.o blat.o mk.o swap.o hassuffix.o execvp.o ipparse.o types.o strfind.o utf.o syswrap-ss.o cstrconv.o search.o die.o units.o result.o bitset.o env.o resolve.o intparse.o hasprefix.o mkpath.o getint.o dirname.o sleq.o endian.o spork.o assert.o cmp.o chartype.o bigint.o hashfuncs.o slfill.o fndup.o dial.o
-echo cd $pwd; cd $pwd
+echo $pwd/muse/muse -o std fmtfuncs.use fmt.use try.use pathjoin.use strjoin.use sljoin.use slpush.use strstrip.use htab.use now.use getcwd.use rand.use dir.use slurp.use varargs.use strbuf.use clear.use slput.use strsplit.use introspect.use alloc.use optparse.use memops.use fltbits.use sldup.use fltfmt.use extremum.use option.use slcp.use errno.use wait.use putint.use syswrap.use sort.use blat.use mk.use swap.use hassuffix.use execvp.use ipparse.use types.use slpop.use strfind.use utf.use syswrap-ss.use cstrconv.use search.use die.use units.use result.use bitset.use env.use resolve.use intparse.use hasprefix.use mkpath.use getint.use dirname.use sleq.use endian.use spork.use assert.use cmp.use chartype.use bigint.use hashfuncs.use slfill.use fndup.use dial.use ; $pwd/muse/muse -o std fmtfuncs.use fmt.use try.use pathjoin.use strjoin.use sljoin.use slpush.use strstrip.use htab.use now.use getcwd.use rand.use dir.use slurp.use varargs.use strbuf.use clear.use slput.use strsplit.use introspect.use alloc.use optparse.use memops.use fltbits.use sldup.use fltfmt.use extremum.use option.use slcp.use errno.use wait.use putint.use syswrap.use sort.use blat.use mk.use swap.use hassuffix.use execvp.use ipparse.use types.use slpop.use strfind.use utf.use syswrap-ss.use cstrconv.use search.use die.use units.use result.use bitset.use env.use resolve.use intparse.use hasprefix.use mkpath.use getint.use dirname.use sleq.use endian.use spork.use assert.use cmp.use chartype.use bigint.use hashfuncs.use slfill.use fndup.use dial.use
+echo ar -rcs libstd.a fmtfuncs.o fmt.o try.o pathjoin.o strjoin.o memops-impl.o sljoin.o slpush.o strstrip.o htab.o now.o getcwd.o rand.o dir.o slurp.o varargs.o strbuf.o clear.o slput.o strsplit.o introspect.o alloc.o optparse.o memops.o fltbits.o sldup.o fltfmt.o extremum.o option.o slcp.o errno.o wait.o putint.o syswrap.o sort.o blat.o mk.o swap.o hassuffix.o execvp.o ipparse.o types.o slpop.o strfind.o utf.o syswrap-ss.o cstrconv.o search.o die.o units.o result.o bitset.o env.o resolve.o intparse.o hasprefix.o mkpath.o getint.o dirname.o sleq.o endian.o spork.o assert.o cmp.o chartype.o bigint.o hashfuncs.o slfill.o fndup.o dial.o ; ar -rcs libstd.a fmtfuncs.o fmt.o try.o pathjoin.o strjoin.o memops-impl.o sljoin.o slpush.o strstrip.o htab.o now.o getcwd.o rand.o dir.o slurp.o varargs.o strbuf.o clear.o slput.o strsplit.o introspect.o alloc.o optparse.o memops.o fltbits.o sldup.o fltfmt.o extremum.o option.o slcp.o errno.o wait.o putint.o syswrap.o sort.o blat.o mk.o swap.o hassuffix.o execvp.o ipparse.o types.o slpop.o strfind.o utf.o syswrap-ss.o cstrconv.o search.o die.o units.o result.o bitset.o env.o resolve.o intparse.o hasprefix.o mkpath.o getint.o dirname.o sleq.o endian.o spork.o assert.o cmp.o chartype.o bigint.o hashfuncs.o slfill.o fndup.o dial.o
echo cd $pwd/lib/regex; cd $pwd/lib/regex
echo $pwd/6/6m -I ../std -I ../sys types.myr ; $pwd/6/6m -I ../std -I ../sys types.myr
echo $pwd/6/6m -I ../std -I ../sys interp.myr ; $pwd/6/6m -I ../std -I ../sys interp.myr
@@ -92,7 +91,6 @@
echo $pwd/6/6m -I ../std -I ../sys compile.myr ; $pwd/6/6m -I ../std -I ../sys compile.myr
echo $pwd/muse/muse -o regex interp.use types.use compile.use ranges.use ; $pwd/muse/muse -o regex interp.use types.use compile.use ranges.use
echo ar -rcs libregex.a interp.o types.o compile.o ranges.o ; ar -rcs libregex.a interp.o types.o compile.o ranges.o
-echo cd $pwd; cd $pwd
echo cd $pwd/lib/bio; cd $pwd/lib/bio
echo $pwd/6/6m -I ../sys -I ../std bio.myr ; $pwd/6/6m -I ../sys -I ../std bio.myr
echo $pwd/6/6m -I ../sys -I ../std puti.myr ; $pwd/6/6m -I ../sys -I ../std puti.myr
@@ -99,7 +97,6 @@
echo $pwd/6/6m -I ../sys -I ../std geti.myr ; $pwd/6/6m -I ../sys -I ../std geti.myr
echo $pwd/muse/muse -o bio puti.use bio.use geti.use ; $pwd/muse/muse -o bio puti.use bio.use geti.use
echo ar -rcs libbio.a puti.o bio.o geti.o ; ar -rcs libbio.a puti.o bio.o geti.o
-echo cd $pwd; cd $pwd
echo cd $pwd/mbld; cd $pwd/mbld
echo $pwd/6/6m -I ../lib/regex -I ../lib/bio -I ../lib/std -I ../lib/sys config.myr ; $pwd/6/6m -I ../lib/regex -I ../lib/bio -I ../lib/std -I ../lib/sys config.myr
echo $pwd/6/6m -I ../lib/regex -I ../lib/bio -I ../lib/std -I ../lib/sys opts.myr ; $pwd/6/6m -I ../lib/regex -I ../lib/bio -I ../lib/std -I ../lib/sys opts.myr