ref: 287851072697781133b34d2b1f721e4f7853d0bb
parent: 27bcd8512583e6cf64a74f53071111d642e67e61
parent: a185ab3cc28f3211a74caaab550337c45a8a847b
author: Ori Bernstein <ori@eigenstate.org>
date: Thu Jan 1 11:13:08 EST 2015
Merge branch 'master' of git+ssh://git.eigenstate.org/git/ori/mbld Conflicts: util.myr
--- a/configure
+++ b/configure
@@ -41,7 +41,8 @@
echo "const Arcmd = [\"ar\", \"-rcs\"]" >> config.myr
echo "const Ascmd = [\"as\", \"-g\"]" >> config.myr
echo "const Directlib = false" >> config.myr
-echo "const Manprefix = \"/usr/share/man/man"
+echo "const Runtime = \"_myrrt.o\"" >> config.myr
+echo "const Manprefix = \"/usr/share/man/man\"" >> config.myr
case $OS in
*Linux*)
echo 'export SYS=linux' >> config.mk
--- a/util.myr
+++ b/util.myr
@@ -20,7 +20,7 @@
std.fatal(1, "could not fork command\n")
elif pid == 0
if dir.len > 0
- if std.chdir(dir)
+ if !std.chdir(dir)
std.fatal(1, "unable to enter directory %s\n", dir)
;;
;;