hare

commit ccae373061634a7161b08ab3c9d05c6e99b3b10a
parent 17c08354e12b77c54266855fef7ccba58a8366ee
Author: Drew DeVault <sir@cmpwn.com>
Date:   Sun,  7 Feb 2021 19:46:54 -0500

Fix up dependency graph errors

Diffstat:
M
Makefile
 | 
8
++++----
M
gen-stdlib
 | 
2
+-
M
mk/stdlib.mk
 | 
4
++--

3 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/Makefile b/Makefile
@@ -20,20 +20,20 @@ include mk/stdlib.mk
 hare_srcs=\
 	main.ha
 
-$(HARECACHE)/hare.ssa: $(hare_srcs)
+$(HARECACHE)/hare.ssa: $(hare_srcs) $(hare_stdlib_deps)
 	@printf 'HAREC\t$@\n'
 	@HARECACHE=$(HARECACHE) $(HAREC) $(HAREFLAGS) -o $@ $(hare_srcs)
 
-$(TESTCACHE)/hare.ssa: $(hare_srcs)
+$(TESTCACHE)/hare.ssa: $(hare_srcs) $(hare_testlib_deps)
 	@printf 'HAREC\t$@\n'
 	@HARECACHE=$(TESTCACHE) $(HAREC) $(TESTHAREFLAGS) -o $@ $(hare_srcs)
 
-hare: $(stdlib_start) $(hare_stdlib_deps) $(HARECACHE)/hare.o
+hare: $(stdlib_start) $(HARECACHE)/hare.o
 	@printf 'LD\t$@\n'
 	@$(LD) -T $(rtscript) -o $@ \
 		$(stdlib_start) $(HARECACHE)/hare.o $(hare_stdlib_deps)
 
-hare-tests: $(testlib_start) $(hare_testlib_deps) $(TESTCACHE)/hare.o
+hare-tests: $(testlib_start) $(TESTCACHE)/hare.o
 	@printf 'LD\t$@\n'
 	@$(LD) -T $(rtscript) -o $@ \
 		$(testlib_start) $(TESTCACHE)/hare.o $(hare_testlib_deps)
diff --git a/gen-stdlib b/gen-stdlib
@@ -178,7 +178,7 @@ os() {
 		'$(PLATFORM)/stdfd.ha' \
 		environ.ha \
 		stdfd.ha
-	gen_ssa os strings types
+	gen_ssa os io strings types
 }
 
 os_exec() {
diff --git a/mk/stdlib.mk b/mk/stdlib.mk
@@ -162,7 +162,7 @@ stdlib_os_srcs= \
 	$(STDLIB)/os/environ.ha \
 	$(STDLIB)/os/stdfd.ha
 
-$(HARECACHE)/os/os.ssa: $(stdlib_os_srcs) $(stdlib_rt) $(stdlib_strings) $(stdlib_types)
+$(HARECACHE)/os/os.ssa: $(stdlib_os_srcs) $(stdlib_rt) $(stdlib_io) $(stdlib_strings) $(stdlib_types)
 	@printf 'HAREC \t$@\n'
 	@mkdir -p $(HARECACHE)/os
 	@HARECACHE=$(HARECACHE) $(HAREC) $(HAREFLAGS) -o $@ -Nos \
@@ -386,7 +386,7 @@ testlib_os_srcs= \
 	$(STDLIB)/os/environ.ha \
 	$(STDLIB)/os/stdfd.ha
 
-$(TESTCACHE)/os/os.ssa: $(testlib_os_srcs) $(testlib_rt) $(testlib_strings) $(testlib_types)
+$(TESTCACHE)/os/os.ssa: $(testlib_os_srcs) $(testlib_rt) $(testlib_io) $(testlib_strings) $(testlib_types)
 	@printf 'HAREC \t$@\n'
 	@mkdir -p $(TESTCACHE)/os
 	@HARECACHE=$(TESTCACHE) $(HAREC) $(TESTHAREFLAGS) -o $@ -Nos \