summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOri Bernstein <ori@eigenstate.org>2017-07-23 20:00:28 -0700
committerOri Bernstein <ori@eigenstate.org>2017-07-23 20:00:28 -0700
commit492c991bcb22a37377505fc97f8e976ef17bb9c1 (patch)
treeacf016155d68d9c0348d57af8fc6ea1a13365334
parent16570e96dac87d60ed54aee8d3ff277923e36b5b (diff)
downloadmc-492c991bcb22a37377505fc97f8e976ef17bb9c1.tar.gz
Preparing for the new mbld.
It's a tad stricter about a couple of things.
-rw-r--r--lib/crypto/bld.sub7
-rw-r--r--lib/thread/bld.sub6
-rwxr-xr-xtest/runtest.sh4
3 files changed, 13 insertions, 4 deletions
diff --git a/lib/crypto/bld.sub b/lib/crypto/bld.sub
index 34117d1..402634b 100644
--- a/lib/crypto/bld.sub
+++ b/lib/crypto/bld.sub
@@ -22,10 +22,15 @@ lib crypto =
;;
-lib testutil =
+lib testutil {noinst} =
util.myr
+
+ lib ../std:std
+ lib ../sys:sys
+ lib ../thread:thread
;;
testdeps =
testutil
+ ../testr:testr
;;
diff --git a/lib/thread/bld.sub b/lib/thread/bld.sub
index 9d69ecd..5a2f34f 100644
--- a/lib/thread/bld.sub
+++ b/lib/thread/bld.sub
@@ -46,6 +46,10 @@ lib thread =
lib ../std:std
;;
-lib testutil =
+lib testutil {noinst} =
util.myr
+
+ lib ../sys:sys
+ lib ../std:std
+ lib thread
;;
diff --git a/test/runtest.sh b/test/runtest.sh
index 52871dc..d8f959e 100755
--- a/test/runtest.sh
+++ b/test/runtest.sh
@@ -11,8 +11,8 @@ NPASSES=0
build() {
rm -f $1 $1.o $1.s $1.use
- echo mbld -b $1 -C../6/6m -M../muse/muse -I../lib/std -I../lib/sys -r../rt/_myrrt.o $1.myr
- ../mbld/mbld -b $1 -C../6/6m -M../muse/muse -I../lib/std -I../lib/sys -r../rt/_myrrt.o $1.myr
+ echo mbld -b $1 -I../lib/std -I../lib/sys -r../rt/_myrrt.o $1.myr
+ ../mbld/mbld -b $1 -I../lib/std -I../lib/sys -r../rt/_myrrt.o $1.myr
}
pass() {