summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOri Bernstein <ori@eigenstate.org>2015-12-29 01:55:49 -0800
committerOri Bernstein <ori@eigenstate.org>2015-12-29 01:55:49 -0800
commit84e2dbc90b4224be255381c8cd60fdda32a63377 (patch)
tree700836245c2eb6d74d1ab66b716b7b0408bddf5b
parent2088041377729498bfa0b4fc5720b020051025d8 (diff)
downloadmc-84e2dbc90b4224be255381c8cd60fdda32a63377.tar.gz
Regenerate FreeBSD build script.
-rwxr-xr-xmbldwrap.sh2
-rwxr-xr-xmk/bootstrap/bootstrap+FreeBSD-amd64.sh7
2 files changed, 5 insertions, 4 deletions
diff --git a/mbldwrap.sh b/mbldwrap.sh
index e4aacc6..9d94fd1 100755
--- a/mbldwrap.sh
+++ b/mbldwrap.sh
@@ -19,5 +19,5 @@ if [ -f mbld/mbld ]; then
./mbld/mbld $@ || mbld $@ || \
(echo "Unable to run mbld $@; have you build successfully"; false)
else
- ./mbld/mbld || mbld
+ ./mbld/mbld || mbld || $BOOT
fi
diff --git a/mk/bootstrap/bootstrap+FreeBSD-amd64.sh b/mk/bootstrap/bootstrap+FreeBSD-amd64.sh
index 9cf0fbb..b5706f8 100755
--- a/mk/bootstrap/bootstrap+FreeBSD-amd64.sh
+++ b/mk/bootstrap/bootstrap+FreeBSD-amd64.sh
@@ -66,13 +66,14 @@ echo $pwd/6/6m -I ../sys -I . clear.myr ; $pwd/6/6m -I ../sys -I . clear.myr
echo $pwd/6/6m -I ../sys -I . wait+posixy.myr ; $pwd/6/6m -I ../sys -I . wait+posixy.myr
echo $pwd/6/6m -I ../sys -I . strjoin.myr ; $pwd/6/6m -I ../sys -I . strjoin.myr
echo $pwd/6/6m -I ../sys -I . mk.myr ; $pwd/6/6m -I ../sys -I . mk.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 . mktemp.myr ; $pwd/6/6m -I ../sys -I . mktemp.myr
echo $pwd/6/6m -I ../sys -I . fndup.myr ; $pwd/6/6m -I ../sys -I . fndup.myr
echo $pwd/6/6m -I ../sys -I . putint.myr ; $pwd/6/6m -I ../sys -I . putint.myr
echo $pwd/6/6m -I ../sys -I . mkpath.myr ; $pwd/6/6m -I ../sys -I . mkpath.myr
echo $pwd/6/6m -I ../sys -I . endian.myr ; $pwd/6/6m -I ../sys -I . endian.myr
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
@@ -83,8 +84,8 @@ echo $pwd/6/6m -I ../sys -I . getcwd.myr ; $pwd/6/6m -I ../sys -I . getcwd.myr
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 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 writeall.use putint.use syswrap.use sort.use dir.use blat.use mk.use swap.use hassuffix.use execvp.use ipparse.use types.use slpop.use strfind.use utf.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 syswrap-ss.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 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 writeall.use putint.use syswrap.use sort.use dir.use blat.use mk.use swap.use hassuffix.use execvp.use ipparse.use types.use slpop.use strfind.use utf.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 syswrap-ss.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 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 writeall.o putint.o syswrap.o sort.o dir.o blat.o mk.o swap.o hassuffix.o execvp.o ipparse.o types.o slpop.o strfind.o utf.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 syswrap-ss.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 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 writeall.o putint.o syswrap.o sort.o dir.o blat.o mk.o swap.o hassuffix.o execvp.o ipparse.o types.o slpop.o strfind.o utf.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 syswrap-ss.o chartype.o bigint.o hashfuncs.o slfill.o fndup.o dial.o
+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 slurp.use varargs.use strbuf.use clear.use slput.use strsplit.use introspect.use mktemp.use alloc.use optparse.use memops.use fltbits.use sldup.use fltfmt.use extremum.use option.use slcp.use errno.use wait.use writeall.use putint.use syswrap.use sort.use dir.use blat.use mk.use swap.use hassuffix.use execvp.use ipparse.use types.use slpop.use strfind.use utf.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 syswrap-ss.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 slurp.use varargs.use strbuf.use clear.use slput.use strsplit.use introspect.use mktemp.use alloc.use optparse.use memops.use fltbits.use sldup.use fltfmt.use extremum.use option.use slcp.use errno.use wait.use writeall.use putint.use syswrap.use sort.use dir.use blat.use mk.use swap.use hassuffix.use execvp.use ipparse.use types.use slpop.use strfind.use utf.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 syswrap-ss.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 slurp.o varargs.o strbuf.o clear.o slput.o strsplit.o introspect.o mktemp.o alloc.o optparse.o memops.o fltbits.o sldup.o fltfmt.o extremum.o option.o slcp.o errno.o wait.o writeall.o putint.o syswrap.o sort.o dir.o blat.o mk.o swap.o hassuffix.o execvp.o ipparse.o types.o slpop.o strfind.o utf.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 syswrap-ss.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 slurp.o varargs.o strbuf.o clear.o slput.o strsplit.o introspect.o mktemp.o alloc.o optparse.o memops.o fltbits.o sldup.o fltfmt.o extremum.o option.o slcp.o errno.o wait.o writeall.o putint.o syswrap.o sort.o dir.o blat.o mk.o swap.o hassuffix.o execvp.o ipparse.o types.o slpop.o strfind.o utf.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 syswrap-ss.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