summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOri Bernstein <ori@eigenstate.org>2015-04-14 22:09:12 -0700
committerOri Bernstein <ori@eigenstate.org>2015-04-14 22:09:12 -0700
commite086260086fdbf25ebd2de0adaf66299003ad646 (patch)
tree5f94a50073195e7237062b425bb0c65deb9e8bca
parentb0906887bc2c638098970496d65c673b491ad38e (diff)
downloadmc-e086260086fdbf25ebd2de0adaf66299003ad646.tar.gz
Make all bootstrapped paths relative.
-rwxr-xr-xbootstrap.sh4
-rwxr-xr-xgenbootstrap.sh2
2 files changed, 3 insertions, 3 deletions
diff --git a/bootstrap.sh b/bootstrap.sh
index efb4b57..dd23f46 100755
--- a/bootstrap.sh
+++ b/bootstrap.sh
@@ -208,5 +208,5 @@ echo ../6/6m -I ../libstd -I ../libbio -I ../libregex test.myr
../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
diff --git a/genbootstrap.sh b/genbootstrap.sh
index 9fbd086..bde4bc3 100755
--- a/genbootstrap.sh
+++ b/genbootstrap.sh
@@ -9,7 +9,7 @@ mbld clean
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\`:" | \