ref: 2cecb2f0578cc0893fbb147dcc3d174f6643baac
parent: 99df731a4230688e4c158277a8cf4aafe62b8bd2
author: Ori Bernstein <ori@eigenstate.org>
date: Fri Sep 4 13:16:08 EDT 2015
Fix the OSX bootstrap script.
--- a/mk/bootstrap/bootstrap+Darwin-x86_64.sh
+++ b/mk/bootstrap/bootstrap+Darwin-x86_64.sh
@@ -82,29 +82,29 @@
echo ar -rcs libstd.a fmtfuncs.o fmt.o try.o pathjoin.o strjoin.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 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 cmp.o chartype.o bigint.o hashfuncs.o slfill.o dial.o ; ar -rcs libstd.a fmtfuncs.o fmt.o try.o pathjoin.o strjoin.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 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 cmp.o chartype.o bigint.o hashfuncs.o slfill.o dial.o
echo cd $pwd; cd $pwd
echo cd $pwd/lib/regex; cd $pwd/lib/regex
-echo $pwd/6/6m -I ../std types.myr ; $pwd/6/6m -I ../std types.myr
-echo $pwd/6/6m -I ../std interp.myr ; $pwd/6/6m -I ../std interp.myr
-echo $pwd/6/6m -I ../std ranges.myr ; $pwd/6/6m -I ../std ranges.myr
-echo $pwd/6/6m -I ../std compile.myr ; $pwd/6/6m -I ../std compile.myr
+echo $pwd/6/6m -I ../sys -I ../std types.myr ; $pwd/6/6m -I ../sys -I ../std types.myr
+echo $pwd/6/6m -I ../sys -I ../std interp.myr ; $pwd/6/6m -I ../sys -I ../std interp.myr
+echo $pwd/6/6m -I ../sys -I ../std ranges.myr ; $pwd/6/6m -I ../sys -I ../std ranges.myr
+echo $pwd/6/6m -I ../sys -I ../std compile.myr ; $pwd/6/6m -I ../sys -I ../std 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 ../std bio.myr ; $pwd/6/6m -I ../std bio.myr
-echo $pwd/6/6m -I ../std puti.myr ; $pwd/6/6m -I ../std puti.myr
-echo $pwd/6/6m -I ../std geti.myr ; $pwd/6/6m -I ../std geti.myr
+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 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/lib/regex; cd $pwd/lib/regex
-echo $pwd/6/6m -I . -I ../bio -I ../std redump.myr ; $pwd/6/6m -I . -I ../bio -I ../std redump.myr
-echo ld -pagezero_size 0x100000000 -macosx_version_min 10.6 -o redump $pwd/rt/_myrrt.o redump.o -L. -L../bio -L../std -lregex -lbio -lstd -lsys -macosx_version_min 10.6 ; ld -pagezero_size 0x100000000 -macosx_version_min 10.6 -o redump $pwd/rt/_myrrt.o redump.o -L. -L../bio -L../std -lregex -lbio -lstd -lsys -macosx_version_min 10.6
+echo $pwd/6/6m -I . -I ../sys -I ../bio -I ../std redump.myr ; $pwd/6/6m -I . -I ../sys -I ../bio -I ../std redump.myr
+echo ld -pagezero_size 0x100000000 -macosx_version_min 10.6 -o redump $pwd/rt/_myrrt.o redump.o -L. -L../sys -L../bio -L../std -lregex -lbio -lstd -lsys -macosx_version_min 10.6 ; ld -pagezero_size 0x100000000 -macosx_version_min 10.6 -o redump $pwd/rt/_myrrt.o redump.o -L. -L../sys -L../bio -L../std -lregex -lbio -lstd -lsys -macosx_version_min 10.6
echo cd $pwd; cd $pwd
echo cd $pwd/lib/cryptohash; cd $pwd/lib/cryptohash
-echo $pwd/6/6m -I ../std sha1.myr ; $pwd/6/6m -I ../std sha1.myr
-echo $pwd/6/6m -I ../std sha512.myr ; $pwd/6/6m -I ../std sha512.myr
-echo $pwd/6/6m -I ../std sha256.myr ; $pwd/6/6m -I ../std sha256.myr
-echo $pwd/6/6m -I ../std md5.myr ; $pwd/6/6m -I ../std md5.myr
+echo $pwd/6/6m -I ../sys -I ../std sha1.myr ; $pwd/6/6m -I ../sys -I ../std sha1.myr
+echo $pwd/6/6m -I ../sys -I ../std sha512.myr ; $pwd/6/6m -I ../sys -I ../std sha512.myr
+echo $pwd/6/6m -I ../sys -I ../std sha256.myr ; $pwd/6/6m -I ../sys -I ../std sha256.myr
+echo $pwd/6/6m -I ../sys -I ../std md5.myr ; $pwd/6/6m -I ../sys -I ../std md5.myr
echo $pwd/muse/muse -o cryptohash md5.use sha1.use sha512.use sha256.use ; $pwd/muse/muse -o cryptohash md5.use sha1.use sha512.use sha256.use
echo ar -rcs libcryptohash.a md5.o sha1.o sha512.o sha256.o ; ar -rcs libcryptohash.a md5.o sha1.o sha512.o sha256.o
echo cd $pwd; cd $pwd