commit 9e7aeebbf63677da4bffefcca5fb4dbded521937 parent 1052d5acbe47e8eb33cb56736ed6245bc05148d4 Author: Drew DeVault <sir@cmpwn.com> Date: Thu, 4 Feb 2021 17:06:11 -0500 Update stdlib Diffstat:
M | gen-stdlib | | | 21 | ++++++++++++++++----- |
M | mk/stdlib.mk | | | 3 | ++- |
2 files changed, 18 insertions(+), 6 deletions(-)
diff --git a/gen-stdlib b/gen-stdlib @@ -125,16 +125,27 @@ strconv() { gen_lib strconv } -io() { - # XXX: Sort me only after fixing forward references to alias types - # Sort it to see what the problem is if you don't understand - printf '# io\n' +gensrcs_io() { gen_srcs io \ 'arch$(ARCH).ha' \ types.ha \ copy.ha \ println.ha \ - stream.ha + stream.ha \ + $* +} + +io() { + # XXX: Sort me only after fixing forward references to alias types + # Sort it to see what the problem is if you don't understand + printf '# io\n' + if [ $testing -eq 0 ] + then + gensrcs_io + else + gensrcs_io \ + copy+test.ha + fi gen_ssa io gen_lib io } diff --git a/mk/stdlib.mk b/mk/stdlib.mk @@ -319,7 +319,8 @@ testlib_io_srcs= \ $(STDLIB)/io/types.ha \ $(STDLIB)/io/copy.ha \ $(STDLIB)/io/println.ha \ - $(STDLIB)/io/stream.ha + $(STDLIB)/io/stream.ha \ + $(STDLIB)/io/copy+test.ha $(TESTCACHE)/io/io.ssa: $(testlib_io_srcs) $(testlib_rt) @printf 'HAREC \t$@\n'