From 607a0badb2fe7251c9d394d27d770a77c16dc3f2 Mon Sep 17 00:00:00 2001
From: Kaz Kylheku <kaz@kylheku.com>
Date: Sun, 30 Jun 2024 18:42:55 -0700
Subject: build: split tlos into three groups rather than two.

It seems that there are several more .tlo files that we should
compile earlier for a better build time.

* Makefile (STDLIB_MIDDLE_TLOS): New variable. We include
error.tlo in here because a new circular dependency has been
revealed involving usr:catch.
(STDLIB_LATE_TLOS): Also exclude STDLIB_MIDDLE_TLOS.
(all): Depend on STDLIB_MIDDLE_TLOS between the early and late
ones.
---
 Makefile | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/Makefile b/Makefile
index b481c6b9..b271734b 100644
--- a/Makefile
+++ b/Makefile
@@ -74,7 +74,9 @@ STDLIB_TLOS := $(patsubst %.tl,%.tlo,$(STDLIB_SRCS))
 
 STDLIB_EARLY_TLOS := $(addprefix stdlib/,optimize.tlo param.tlo \
                                  compiler.tlo place.tlo asm.tlo)
-STDLIB_LATE_TLOS := $(filter-out $(STDLIB_EARLY_TLOS),$(STDLIB_TLOS))
+STDLIB_MIDDLE_TLOS := $(addprefix stdlib/,build.tlo op.tlo struct.tlo error.tlo)
+STDLIB_LATE_TLOS := $(filter-out $(STDLIB_EARLY_TLOS),$(STDLIB_TLOS) \
+                                 $(STDLIB_MIDDLE_TLOS))
 
 ifneq ($(have_git),)
 SRCS := $(addprefix $(top_srcdir),\
@@ -217,7 +219,8 @@ endif
 
 .PHONY: all
 
-all: $(BUILD_TARGETS) $(STDLIB_EARLY_TLOS) $(STDLIB_LATE_TLOS)
+all: $(BUILD_TARGETS) $(STDLIB_EARLY_TLOS) $(STDLIB_MIDDLE_TLOS) \
+     $(STDLIB_LATE_TLOS)
 
 $(PROG): $(OPT_OBJS) $(EXTRA_OBJS-y)
 	$(call LINK_PROG,$(OPT_FLAGS))
-- 
cgit v1.2.3