summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOri Bernstein <ori@eigenstate.org>2015-09-03 09:35:19 -0400
committerOri Bernstein <ori@eigenstate.org>2015-09-04 16:06:00 -0400
commit177875c6a96d728a9a35ab6a52fd00a4ff837ce1 (patch)
tree9230515d91090b5e074f856abb741da0bc326839
parentca51f97ae84297763505654567d38a74dc8dad5b (diff)
downloadmc-177875c6a96d728a9a35ab6a52fd00a4ff837ce1.tar.gz
Split lib/sys out of lib/std
-rw-r--r--lib/bld.sub1
-rw-r--r--lib/std/bld.sub23
-rw-r--r--lib/sys/ifreq+freebsd.myr (renamed from lib/std/ifreq+freebsd.myr)0
-rw-r--r--lib/sys/ifreq+linux.myr (renamed from lib/std/ifreq+linux.myr)0
-rw-r--r--lib/sys/ifreq+osx.myr (renamed from lib/std/ifreq+osx.myr)0
-rw-r--r--lib/sys/sys+freebsd-x64.myr (renamed from lib/std/sys+freebsd-x64.myr)0
-rw-r--r--lib/sys/sys+linux-x64.myr (renamed from lib/std/sys+linux-x64.myr)0
-rw-r--r--lib/sys/sys+osx-x64.myr (renamed from lib/std/sys+osx-x64.myr)0
-rw-r--r--lib/sys/sys+plan9-x64.myr (renamed from lib/std/sys+plan9-x64.myr)0
-rw-r--r--lib/sys/syscall+freebsd-x64.s (renamed from lib/std/syscall+freebsd-x64.s)0
-rw-r--r--lib/sys/syscall+linux-x64.s (renamed from lib/std/syscall+linux-x64.s)0
-rw-r--r--lib/sys/syscall+osx-x64.s (renamed from lib/std/syscall+osx-x64.s)0
-rw-r--r--lib/sys/syscall+plan9-x64.s (renamed from lib/std/syscall+plan9-x64.s)0
-rw-r--r--lib/sys/syserrno+linux.myr (renamed from lib/std/syserrno+linux.myr)0
-rw-r--r--lib/sys/syserrno+osx.myr (renamed from lib/std/syserrno+osx.myr)0
-rw-r--r--lib/sys/systypes.myr (renamed from lib/std/systypes.myr)0
-rw-r--r--lib/sys/util+plan9-x64.s (renamed from lib/std/util+plan9-x64.s)0
-rw-r--r--lib/sys/util+posixy-x64.s (renamed from lib/std/util+posixy-x64.s)0
-rw-r--r--mbld/bld.sub2
-rw-r--r--mk/c.mk3
20 files changed, 5 insertions, 24 deletions
diff --git a/lib/bld.sub b/lib/bld.sub
index 806f9a9..1cec234 100644
--- a/lib/bld.sub
+++ b/lib/bld.sub
@@ -1,4 +1,5 @@
sub =
+ sys
std
bio
regex
diff --git a/lib/std/bld.sub b/lib/std/bld.sub
index b84be64..b5e37f6 100644
--- a/lib/std/bld.sub
+++ b/lib/std/bld.sub
@@ -1,26 +1,5 @@
-lib sys =
- sys+freebsd-x64.myr
- sys+linux-x64.myr
- sys+osx-x64.myr
- sys+plan9-x64.myr
- syscall+freebsd-x64.s
- syscall+linux-x64.s
- syscall+osx-x64.s
- syscall+plan9-x64.s
- syserrno+linux.myr
- syserrno+osx.myr
- systypes.myr
- ifreq+freebsd.myr
- ifreq+linux.myr
- ifreq+osx.myr
- ifreq+plan9.myr
- ifreq.myr # dummy file: plan9 doesn't have ifreq
- util+plan9-x64.s
- util+posixy-x64.s
-;;
-
lib std {inc=.} =
- lib sys
+ lib ../sys:sys
# portable files
alloc.myr
diff --git a/lib/std/ifreq+freebsd.myr b/lib/sys/ifreq+freebsd.myr
index e69de29..e69de29 100644
--- a/lib/std/ifreq+freebsd.myr
+++ b/lib/sys/ifreq+freebsd.myr
diff --git a/lib/std/ifreq+linux.myr b/lib/sys/ifreq+linux.myr
index 62be8ee..62be8ee 100644
--- a/lib/std/ifreq+linux.myr
+++ b/lib/sys/ifreq+linux.myr
diff --git a/lib/std/ifreq+osx.myr b/lib/sys/ifreq+osx.myr
index f5205bf..f5205bf 100644
--- a/lib/std/ifreq+osx.myr
+++ b/lib/sys/ifreq+osx.myr
diff --git a/lib/std/sys+freebsd-x64.myr b/lib/sys/sys+freebsd-x64.myr
index 279d360..279d360 100644
--- a/lib/std/sys+freebsd-x64.myr
+++ b/lib/sys/sys+freebsd-x64.myr
diff --git a/lib/std/sys+linux-x64.myr b/lib/sys/sys+linux-x64.myr
index 9e1da55..9e1da55 100644
--- a/lib/std/sys+linux-x64.myr
+++ b/lib/sys/sys+linux-x64.myr
diff --git a/lib/std/sys+osx-x64.myr b/lib/sys/sys+osx-x64.myr
index ca2a63a..ca2a63a 100644
--- a/lib/std/sys+osx-x64.myr
+++ b/lib/sys/sys+osx-x64.myr
diff --git a/lib/std/sys+plan9-x64.myr b/lib/sys/sys+plan9-x64.myr
index f183dc2..f183dc2 100644
--- a/lib/std/sys+plan9-x64.myr
+++ b/lib/sys/sys+plan9-x64.myr
diff --git a/lib/std/syscall+freebsd-x64.s b/lib/sys/syscall+freebsd-x64.s
index 8002099..8002099 100644
--- a/lib/std/syscall+freebsd-x64.s
+++ b/lib/sys/syscall+freebsd-x64.s
diff --git a/lib/std/syscall+linux-x64.s b/lib/sys/syscall+linux-x64.s
index 53291cb..53291cb 100644
--- a/lib/std/syscall+linux-x64.s
+++ b/lib/sys/syscall+linux-x64.s
diff --git a/lib/std/syscall+osx-x64.s b/lib/sys/syscall+osx-x64.s
index 5984c24..5984c24 100644
--- a/lib/std/syscall+osx-x64.s
+++ b/lib/sys/syscall+osx-x64.s
diff --git a/lib/std/syscall+plan9-x64.s b/lib/sys/syscall+plan9-x64.s
index 4de6502..4de6502 100644
--- a/lib/std/syscall+plan9-x64.s
+++ b/lib/sys/syscall+plan9-x64.s
diff --git a/lib/std/syserrno+linux.myr b/lib/sys/syserrno+linux.myr
index 18a3fc2..18a3fc2 100644
--- a/lib/std/syserrno+linux.myr
+++ b/lib/sys/syserrno+linux.myr
diff --git a/lib/std/syserrno+osx.myr b/lib/sys/syserrno+osx.myr
index 7b5d888..7b5d888 100644
--- a/lib/std/syserrno+osx.myr
+++ b/lib/sys/syserrno+osx.myr
diff --git a/lib/std/systypes.myr b/lib/sys/systypes.myr
index e39f279..e39f279 100644
--- a/lib/std/systypes.myr
+++ b/lib/sys/systypes.myr
diff --git a/lib/std/util+plan9-x64.s b/lib/sys/util+plan9-x64.s
index f4b8586..f4b8586 100644
--- a/lib/std/util+plan9-x64.s
+++ b/lib/sys/util+plan9-x64.s
diff --git a/lib/std/util+posixy-x64.s b/lib/sys/util+posixy-x64.s
index d44ab79..d44ab79 100644
--- a/lib/std/util+posixy-x64.s
+++ b/lib/sys/util+posixy-x64.s
diff --git a/mbld/bld.sub b/mbld/bld.sub
index 20792ec..f04fc21 100644
--- a/mbld/bld.sub
+++ b/mbld/bld.sub
@@ -17,7 +17,7 @@ bin mbld =
# Currently, mbld doesn't add all deps transitively.
# Until this gets fixed, we need to list all dependent
# libraries here explicitly.
- lib @/lib/std:sys
+ lib @/lib/sys:sys
lib @/lib/std:std
lib @/lib/bio:bio
lib @/lib/regex:regex
diff --git a/mk/c.mk b/mk/c.mk
index ca538e5..5e98765 100644
--- a/mk/c.mk
+++ b/mk/c.mk
@@ -6,7 +6,8 @@ _LIBSRCHPATHS=$(addprefix -L, $(dir $(DEPS)))
_LIBINCPATHS=$(addprefix -I, $(dir $(DEPS)))
_LIBPATHS=$(addprefix -l, $(patsubst lib%.a,%,$(notdir $(DEPS))))
-CFLAGS += -O -Wall -Werror -Wextra -Wno-unused-parameter -Wno-missing-field-initializers -g
+# yeah, I should probably remove -Werror, but it's nice for developing alone.
+CFLAGS += -Wall -Werror -Wextra -Wno-unused-parameter -Wno-missing-field-initializers -g
CFLAGS += -MMD -MP -MF ${_DEPSDIR}/$(subst /,-,$*).d
LIB ?= $(INSTLIB)