summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOri Bernstein <ori@eigenstate.org>2015-02-14 12:56:24 -0800
committerOri Bernstein <ori@eigenstate.org>2015-02-14 12:56:24 -0800
commit199e8c38edcfd24d13a5209dced69cf0c9b496d0 (patch)
tree01f7d39f936c09ddbd9eb335fcfedfa943c26de7
parent53712aa0fc95a84fa36b4960aeef98ceee6859bc (diff)
downloadmc-199e8c38edcfd24d13a5209dced69cf0c9b496d0.tar.gz
Use the correct inputs for usefiles.
Get the sys.foo through 'use sys', and not through 'use "sys.use". Also, make sure all .myr files are in the bldfile.
-rw-r--r--Makefile1
-rw-r--r--libstd/Makefile5
-rw-r--r--libstd/blat.myr2
-rw-r--r--libstd/bldfile1
-rw-r--r--libstd/chartype.myr1
-rw-r--r--libstd/dial+posixy.myr3
-rw-r--r--libstd/errno.myr2
-rw-r--r--libstd/strsplit.myr1
-rw-r--r--libstd/utf.myr1
9 files changed, 11 insertions, 6 deletions
diff --git a/Makefile b/Makefile
index b309d47..43a4115 100644
--- a/Makefile
+++ b/Makefile
@@ -11,6 +11,7 @@ include mk/c.mk
include config.mk
check: all
+ $(MAKE) -C libstd check
$(MAKE) -C test check
bench: all
diff --git a/libstd/Makefile b/libstd/Makefile
index 296457f..aeecb55 100644
--- a/libstd/Makefile
+++ b/libstd/Makefile
@@ -129,5 +129,10 @@ uninstall:
rm -f $(abspath $(DESTDIR)/$(INST_ROOT)/lib/myr/libstd.a)
rm -f $(abspath $(DESTDIR)/$(INST_ROOT)/lib/myr/std)
+check: test
+
+test:
+ mbld test
+
../6/6m:
cd ..; $(MAKE)
diff --git a/libstd/blat.myr b/libstd/blat.myr
index 1a6a72b..f0a4eef 100644
--- a/libstd/blat.myr
+++ b/libstd/blat.myr
@@ -9,7 +9,7 @@ pkg std =
const blat = {path, buf
var fd
- fd = openmode(path, Ocreat|Owronly, 0o777)
+ fd = openmode(path, Ocreat|Owronly, 0o666)
if fd < 0
-> false
;;
diff --git a/libstd/bldfile b/libstd/bldfile
index 6a8d57b..2670d75 100644
--- a/libstd/bldfile
+++ b/libstd/bldfile
@@ -25,6 +25,7 @@ lib std {inc=.} =
chartype.myr
clear.myr
cmp.myr
+ cstrconv.myr
dial.myr
die.myr
endian.myr
diff --git a/libstd/chartype.myr b/libstd/chartype.myr
index 8241b52..fe59202 100644
--- a/libstd/chartype.myr
+++ b/libstd/chartype.myr
@@ -1,5 +1,4 @@
use "die.use"
-use "sys.use"
use "types.use"
/*
diff --git a/libstd/dial+posixy.myr b/libstd/dial+posixy.myr
index e8401ac..1554cdb 100644
--- a/libstd/dial+posixy.myr
+++ b/libstd/dial+posixy.myr
@@ -1,3 +1,5 @@
+use sys
+
use "alloc.use"
use "chartype.use"
use "die.use"
@@ -11,7 +13,6 @@ use "resolve.use"
use "result.use"
use "sleq.use"
use "strfind.use"
-use "sys.use"
use "syswrap.use"
use "utf.use"
diff --git a/libstd/errno.myr b/libstd/errno.myr
index 6e95e1a..c14c469 100644
--- a/libstd/errno.myr
+++ b/libstd/errno.myr
@@ -1,4 +1,4 @@
-use "syserrno.use"
+use sys
pkg std =
type errno = int
diff --git a/libstd/strsplit.myr b/libstd/strsplit.myr
index 6142952..b09e8c8 100644
--- a/libstd/strsplit.myr
+++ b/libstd/strsplit.myr
@@ -5,7 +5,6 @@ use "fmt.use"
use "option.use"
use "slpush.use"
use "strfind.use"
-use "sys.use"
use "types.use"
pkg std =
diff --git a/libstd/utf.myr b/libstd/utf.myr
index cefba97..03cc8bb 100644
--- a/libstd/utf.myr
+++ b/libstd/utf.myr
@@ -1,5 +1,4 @@
use "die.use"
-use "sys.use"
use "types.use"
pkg std =