ref: e086260086fdbf25ebd2de0adaf66299003ad646
parent: b0906887bc2c638098970496d65c673b491ad38e
author: Ori Bernstein <[email protected]>
date: Tue Apr 14 18:09:12 EDT 2015
Make all bootstrapped paths relative.
--- a/bootstrap.sh
+++ b/bootstrap.sh
@@ -208,5 +208,5 @@
../6/6m -I ../libstd -I ../libbio -I ../libregex test.myr
echo ../6/6m -I ../libstd -I ../libbio -I ../libregex main.myr
../6/6m -I ../libstd -I ../libbio -I ../libregex main.myr
-echo ld -macosx_version_min 10.6 -pagezero_size 100000000 -o mbld ../rt/_myrrt.o clean.o config.o deps.o types.o fsel.o util.o subdir.o main.o parse.o build.o opts.o install.o test.o -L../libstd -L../libbio -L../libregex -lregex -lbio -lstd -lsys -lsys -lstd -lbio -lregex
- ld -macosx_version_min 10.6 -pagezero_size 100000000 -o mbld ../rt/_myrrt.o clean.o config.o deps.o types.o fsel.o util.o subdir.o main.o parse.o build.o opts.o install.o test.o -L../libstd -L../libbio -L../libregex -lregex -lbio -lstd -lsys -lsys -lstd -lbio -lregex
+echo ld -o mbld ../rt/_myrrt.o clean.o config.o deps.o types.o fsel.o util.o subdir.o main.o parse.o build.o opts.o install.o test.o -L../libstd -L../libbio -L../libregex -L./lib/myr -lregex -lbio -lstd -lsys -lsys -lstd -lbio -lregex
+ ld -o mbld ../rt/_myrrt.o clean.o config.o deps.o types.o fsel.o util.o subdir.o main.o parse.o build.o opts.o install.o test.o -L../libstd -L../libbio -L../libregex -L./lib/myr -lregex -lbio -lstd -lsys -lsys -lstd -lbio -lregex
--- a/genbootstrap.sh
+++ b/genbootstrap.sh
@@ -9,7 +9,7 @@
bootscript=bootstrap+`uname -s`-`uname -m`
echo '#!/bin/sh' > bootstrap.sh
echo 'pwd=`pwd`' >> bootstrap.sh
-mbld | \
+mbld -R. | \
sed "s:Entering directory '\\(.*\\)':\tcd \$pwd/\\1:g" | \
sed "s:Leaving directory.*:\tcd \$pwd:g" | \
sed "s:\\([a-zA-Z0-9_-]*\\)+.*:\`\$pwd/sysselect.sh \1\`:" | \