ref: f1ea96e3b500fdd088c8c89889d5daec2cbcb3dc
parent: 3034887c19bb86b0551c854758a9f93ee1395815
parent: d15a27aec9b0e90c768747ead27b1ceecd7b8b35
author: Ori Bernstein <ori@eigenstate.org>
date: Sun Jun 28 14:06:44 EDT 2015
Merge pull request #3 from PuerkitoBio/fix-build Fix build
--- a/mk/bootstrap/bootstrap+Darwin-x86_64.sh
+++ b/mk/bootstrap/bootstrap+Darwin-x86_64.sh
@@ -105,8 +105,8 @@
echo 6m -I ../libregex -I ../libbio -I ../libstd clean.myr ; 6m -I ../libregex -I ../libbio -I ../libstd clean.myr
echo 6m -I ../libregex -I ../libbio -I ../libstd test.myr ; 6m -I ../libregex -I ../libbio -I ../libstd test.myr
echo 6m -I ../libregex -I ../libbio -I ../libstd main.myr ; 6m -I ../libregex -I ../libbio -I ../libstd main.myr
-echo ld -pagezero_size 0x100000000 -macosx_version_min 10.6 -o mbld /Users/orib/src/myr/mc/rt/_myrrt.o clean.o config.o deps.o types.o fsel.o util.o parse.o main.o build.o opts.o install.o test.o -L../libregex -L../libbio -L../libstd -lregex -lbio -lstd -lsys -macosx_version_min 10.6 ; ld -pagezero_size 0x100000000 -macosx_version_min 10.6 -o mbld /Users/orib/src/myr/mc/rt/_myrrt.o clean.o config.o deps.o types.o fsel.o util.o parse.o main.o build.o opts.o install.o test.o -L../libregex -L../libbio -L../libstd -lregex -lbio -lstd -lsys -macosx_version_min 10.6
+echo ld -pagezero_size 0x100000000 -macosx_version_min 10.6 -o mbld ../rt/_myrrt.o clean.o config.o deps.o types.o fsel.o util.o parse.o main.o build.o opts.o install.o test.o -L../libregex -L../libbio -L../libstd -lregex -lbio -lstd -lsys -macosx_version_min 10.6 ; ld -pagezero_size 0x100000000 -macosx_version_min 10.6 -o mbld ../rt/_myrrt.o clean.o config.o deps.o types.o fsel.o util.o parse.o main.o build.o opts.o install.o test.o -L../libregex -L../libbio -L../libstd -lregex -lbio -lstd -lsys -macosx_version_min 10.6
echo cd $pwd; cd $pwd
echo cd $pwd/libregex; cd $pwd/libregex
echo 6m -I . -I ../libbio -I ../libstd redump.myr ; 6m -I . -I ../libbio -I ../libstd redump.myr
-echo ld -pagezero_size 0x100000000 -macosx_version_min 10.6 -o redump /Users/orib/src/myr/mc/rt/_myrrt.o redump.o -L. -L../libbio -L../libstd -lregex -lbio -lstd -lsys -macosx_version_min 10.6 ; ld -pagezero_size 0x100000000 -macosx_version_min 10.6 -o redump /Users/orib/src/myr/mc/rt/_myrrt.o redump.o -L. -L../libbio -L../libstd -lregex -lbio -lstd -lsys -macosx_version_min 10.6
+echo ld -pagezero_size 0x100000000 -macosx_version_min 10.6 -o redump ../rt/_myrrt.o redump.o -L. -L../libbio -L../libstd -lregex -lbio -lstd -lsys -macosx_version_min 10.6 ; ld -pagezero_size 0x100000000 -macosx_version_min 10.6 -o redump ../rt/_myrrt.o redump.o -L. -L../libbio -L../libstd -lregex -lbio -lstd -lsys -macosx_version_min 10.6
--- a/mk/bootstrap/bootstrap+Linux-x86_64.sh
+++ b/mk/bootstrap/bootstrap+Linux-x86_64.sh
@@ -105,8 +105,8 @@
echo 6m -I ../libregex -I ../libbio -I ../libstd clean.myr ; 6m -I ../libregex -I ../libbio -I ../libstd clean.myr
echo 6m -I ../libregex -I ../libbio -I ../libstd test.myr ; 6m -I ../libregex -I ../libbio -I ../libstd test.myr
echo 6m -I ../libregex -I ../libbio -I ../libstd main.myr ; 6m -I ../libregex -I ../libbio -I ../libstd main.myr
-echo ld -o mbld /home/ori/src/myr/mc/rt/_myrrt.o clean.o config.o deps.o types.o fsel.o util.o parse.o main.o build.o opts.o install.o test.o -L../libregex -L../libbio -L../libstd -lregex -lbio -lstd -lsys ; ld -o mbld /home/ori/src/myr/mc/rt/_myrrt.o clean.o config.o deps.o types.o fsel.o util.o parse.o main.o build.o opts.o install.o test.o -L../libregex -L../libbio -L../libstd -lregex -lbio -lstd -lsys
+echo ld -o mbld ../rt/_myrrt.o clean.o config.o deps.o types.o fsel.o util.o parse.o main.o build.o opts.o install.o test.o -L../libregex -L../libbio -L../libstd -lregex -lbio -lstd -lsys ; ld -o mbld ../rt/_myrrt.o clean.o config.o deps.o types.o fsel.o util.o parse.o main.o build.o opts.o install.o test.o -L../libregex -L../libbio -L../libstd -lregex -lbio -lstd -lsys
echo cd $pwd; cd $pwd
echo cd $pwd/libregex; cd $pwd/libregex
echo 6m -I . -I ../libbio -I ../libstd redump.myr ; 6m -I . -I ../libbio -I ../libstd redump.myr
-echo ld -o redump /home/ori/src/myr/mc/rt/_myrrt.o redump.o -L. -L../libbio -L../libstd -lregex -lbio -lstd -lsys ; ld -o redump /home/ori/src/myr/mc/rt/_myrrt.o redump.o -L. -L../libbio -L../libstd -lregex -lbio -lstd -lsys
+echo ld -o redump ../rt/_myrrt.o redump.o -L. -L../libbio -L../libstd -lregex -lbio -lstd -lsys ; ld -o redump ../rt/_myrrt.o redump.o -L. -L../libbio -L../libstd -lregex -lbio -lstd -lsys