summaryrefslogtreecommitdiff
path: root/mk
diff options
context:
space:
mode:
authorOri Bernstein <ori@eigenstate.org>2016-05-13 19:33:12 -0700
committerOri Bernstein <ori@eigenstate.org>2016-05-13 19:33:12 -0700
commitd6fd6fecd40f1c3dd1a77ae225d8f08fef482624 (patch)
treed2a54a58060fa9bc5c71369d07ba506d71671be1 /mk
parent5bc9a99994e20a7d5ea6bc298e4b37bf7db2e48d (diff)
downloadmc-d6fd6fecd40f1c3dd1a77ae225d8f08fef482624.tar.gz
Regenerate bootstrap for OSX
Diffstat (limited to 'mk')
-rwxr-xr-xmk/bootstrap/bootstrap+Darwin-x86_64.sh14
1 files changed, 8 insertions, 6 deletions
diff --git a/mk/bootstrap/bootstrap+Darwin-x86_64.sh b/mk/bootstrap/bootstrap+Darwin-x86_64.sh
index da789fd..95ec0d6 100755
--- a/mk/bootstrap/bootstrap+Darwin-x86_64.sh
+++ b/mk/bootstrap/bootstrap+Darwin-x86_64.sh
@@ -9,7 +9,7 @@ echo $pwd/6/6m sys+osx-x64.myr && $pwd/6/6m sys+osx-x64.myr &&\
echo $pwd/6/6m ifreq+osx.myr && $pwd/6/6m ifreq+osx.myr &&\
echo as -g -o util.o util+posixy-x64.s && as -g -o util.o util+posixy-x64.s &&\
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 $pwd/muse/muse -o libsys.use -p sys syserrno.use sys.use systypes.use ifreq.use && $pwd/muse/muse -o libsys.use -p 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/lib/std && cd $pwd/lib/std &&\
echo $pwd/6/6m -I ../sys -I . types.myr && $pwd/6/6m -I ../sys -I . types.myr &&\
@@ -22,8 +22,9 @@ echo $pwd/6/6m -I ../sys -I . die.myr && $pwd/6/6m -I ../sys -I . die.myr &&
echo $pwd/6/6m -I ../sys -I . sleq.myr && $pwd/6/6m -I ../sys -I . sleq.myr &&\
echo $pwd/6/6m -I ../sys -I . hassuffix.myr && $pwd/6/6m -I ../sys -I . hassuffix.myr &&\
echo $pwd/6/6m -I ../sys -I . extremum.myr && $pwd/6/6m -I ../sys -I . extremum.myr &&\
-echo $pwd/6/6m -I ../sys -I . units.myr && $pwd/6/6m -I ../sys -I . units.myr &&\
echo $pwd/6/6m -I ../sys -I . memops.myr && $pwd/6/6m -I ../sys -I . memops.myr &&\
+echo $pwd/6/6m -I ../sys -I . threadhooks.myr && $pwd/6/6m -I ../sys -I . threadhooks.myr &&\
+echo $pwd/6/6m -I ../sys -I . units.myr && $pwd/6/6m -I ../sys -I . units.myr &&\
echo $pwd/6/6m -I ../sys -I . alloc.myr && $pwd/6/6m -I ../sys -I . alloc.myr &&\
echo $pwd/6/6m -I ../sys -I . consts.myr && $pwd/6/6m -I ../sys -I . consts.myr &&\
echo $pwd/6/6m -I ../sys -I . chartype.myr && $pwd/6/6m -I ../sys -I . chartype.myr &&\
@@ -53,6 +54,7 @@ echo $pwd/6/6m -I ../sys -I . assert.myr && $pwd/6/6m -I ../sys -I . assert.m
echo $pwd/6/6m -I ../sys -I . now.myr && $pwd/6/6m -I ../sys -I . now.myr &&\
echo $pwd/6/6m -I ../sys -I . rand.myr && $pwd/6/6m -I ../sys -I . rand.myr &&\
echo $pwd/6/6m -I ../sys -I . sljoin.myr && $pwd/6/6m -I ../sys -I . sljoin.myr &&\
+echo $pwd/6/6m -I ../sys -I . readall.myr && $pwd/6/6m -I ../sys -I . readall.myr &&\
echo $pwd/6/6m -I ../sys -I . slurp.myr && $pwd/6/6m -I ../sys -I . slurp.myr &&\
echo $pwd/6/6m -I ../sys -I . dirname.myr && $pwd/6/6m -I ../sys -I . dirname.myr &&\
echo $pwd/6/6m -I ../sys -I . optparse.myr && $pwd/6/6m -I ../sys -I . optparse.myr &&\
@@ -90,21 +92,21 @@ echo $pwd/6/6m -I ../sys -I . getcwd.myr && $pwd/6/6m -I ../sys -I . getcwd.m
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 listen.use strbuf.use clear.use slput.use strsplit.use introspect.use mktemp.use alloc.use optparse.use memops.use fltbits.use striter.use sldup.use fltfmt.use extremum.use option.use slcp.use errno.use wait.use writeall.use putint.use consts.use syswrap.use sort.use blat.use diriter.use mk.use swap.use hassuffix.use execvp.use ipparse.use types.use slpop.use strfind.use utf.use dialparse.use syswrap-ss.use cstrconv.use die.use units.use search.use result.use bitset.use env.use resolve.use intparse.use hasprefix.use mkpath.use getint.use dirname.use sleq.use endian.use iterutil.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 listen.use strbuf.use clear.use slput.use strsplit.use introspect.use mktemp.use alloc.use optparse.use memops.use fltbits.use striter.use sldup.use fltfmt.use extremum.use option.use slcp.use errno.use wait.use writeall.use putint.use consts.use syswrap.use sort.use blat.use diriter.use mk.use swap.use hassuffix.use execvp.use ipparse.use types.use slpop.use strfind.use utf.use dialparse.use syswrap-ss.use cstrconv.use die.use units.use search.use result.use bitset.use env.use resolve.use intparse.use hasprefix.use mkpath.use getint.use dirname.use sleq.use endian.use iterutil.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 listen.o strbuf.o clear.o slput.o strsplit.o introspect.o mktemp.o alloc.o optparse.o memops.o fltbits.o striter.o sldup.o fltfmt.o extremum.o option.o slcp.o errno.o wait.o writeall.o putint.o consts.o syswrap.o sort.o blat.o diriter.o mk.o swap.o hassuffix.o execvp.o ipparse.o types.o slpop.o strfind.o utf.o dialparse.o syswrap-ss.o cstrconv.o die.o units.o search.o result.o bitset.o env.o resolve.o intparse.o hasprefix.o mkpath.o getint.o dirname.o sleq.o endian.o iterutil.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 listen.o strbuf.o clear.o slput.o strsplit.o introspect.o mktemp.o alloc.o optparse.o memops.o fltbits.o striter.o sldup.o fltfmt.o extremum.o option.o slcp.o errno.o wait.o writeall.o putint.o consts.o syswrap.o sort.o blat.o diriter.o mk.o swap.o hassuffix.o execvp.o ipparse.o types.o slpop.o strfind.o utf.o dialparse.o syswrap-ss.o cstrconv.o die.o units.o search.o result.o bitset.o env.o resolve.o intparse.o hasprefix.o mkpath.o getint.o dirname.o sleq.o endian.o iterutil.o spork.o assert.o cmp.o chartype.o bigint.o hashfuncs.o slfill.o fndup.o dial.o &&\
+echo $pwd/muse/muse -o libstd.use -p 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 listen.use strbuf.use clear.use slput.use strsplit.use introspect.use mktemp.use alloc.use optparse.use memops.use fltbits.use striter.use sldup.use fltfmt.use extremum.use option.use errno.use wait.use slcp.use writeall.use putint.use consts.use syswrap.use readall.use sort.use blat.use diriter.use mk.use swap.use hassuffix.use execvp.use ipparse.use types.use slpop.use strfind.use utf.use dialparse.use syswrap-ss.use cstrconv.use die.use units.use search.use result.use bitset.use env.use resolve.use intparse.use hasprefix.use mkpath.use getint.use dirname.use sleq.use endian.use iterutil.use spork.use assert.use cmp.use chartype.use bigint.use threadhooks.use slfill.use hashfuncs.use fndup.use dial.use && $pwd/muse/muse -o libstd.use -p 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 listen.use strbuf.use clear.use slput.use strsplit.use introspect.use mktemp.use alloc.use optparse.use memops.use fltbits.use striter.use sldup.use fltfmt.use extremum.use option.use errno.use wait.use slcp.use writeall.use putint.use consts.use syswrap.use readall.use sort.use blat.use diriter.use mk.use swap.use hassuffix.use execvp.use ipparse.use types.use slpop.use strfind.use utf.use dialparse.use syswrap-ss.use cstrconv.use die.use units.use search.use result.use bitset.use env.use resolve.use intparse.use hasprefix.use mkpath.use getint.use dirname.use sleq.use endian.use iterutil.use spork.use assert.use cmp.use chartype.use bigint.use threadhooks.use slfill.use hashfuncs.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 listen.o strbuf.o clear.o slput.o strsplit.o introspect.o mktemp.o alloc.o optparse.o memops.o fltbits.o striter.o sldup.o fltfmt.o extremum.o option.o errno.o wait.o slcp.o writeall.o putint.o consts.o syswrap.o readall.o sort.o blat.o diriter.o mk.o swap.o hassuffix.o execvp.o ipparse.o types.o slpop.o strfind.o utf.o dialparse.o syswrap-ss.o cstrconv.o die.o units.o search.o result.o bitset.o env.o resolve.o intparse.o hasprefix.o mkpath.o getint.o dirname.o sleq.o endian.o iterutil.o spork.o assert.o cmp.o chartype.o bigint.o threadhooks.o slfill.o hashfuncs.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 listen.o strbuf.o clear.o slput.o strsplit.o introspect.o mktemp.o alloc.o optparse.o memops.o fltbits.o striter.o sldup.o fltfmt.o extremum.o option.o errno.o wait.o slcp.o writeall.o putint.o consts.o syswrap.o readall.o sort.o blat.o diriter.o mk.o swap.o hassuffix.o execvp.o ipparse.o types.o slpop.o strfind.o utf.o dialparse.o syswrap-ss.o cstrconv.o die.o units.o search.o result.o bitset.o env.o resolve.o intparse.o hasprefix.o mkpath.o getint.o dirname.o sleq.o endian.o iterutil.o spork.o assert.o cmp.o chartype.o bigint.o threadhooks.o slfill.o hashfuncs.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 &&\
echo $pwd/6/6m -I ../std -I ../sys ranges.myr && $pwd/6/6m -I ../std -I ../sys ranges.myr &&\
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 $pwd/muse/muse -o libregex.use -p regex interp.use types.use compile.use ranges.use && $pwd/muse/muse -o libregex.use -p 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/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 &&\
echo $pwd/6/6m -I ../sys -I ../std iter.myr && $pwd/6/6m -I ../sys -I ../std iter.myr &&\
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 iter.use && $pwd/muse/muse -o bio puti.use bio.use geti.use iter.use &&\
+echo $pwd/muse/muse -o libbio.use -p bio puti.use bio.use geti.use iter.use && $pwd/muse/muse -o libbio.use -p bio puti.use bio.use geti.use iter.use &&\
echo ar -rcs libbio.a puti.o bio.o geti.o iter.o && ar -rcs libbio.a puti.o bio.o geti.o iter.o &&\
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 &&\