From 3c3e37707a3e6e6b9870a5ba33e323ac4b1b303a Mon Sep 17 00:00:00 2001
From: Bruce Hill <bruce@bruce-hill.com>
Date: Thu, 25 Dec 2025 13:24:19 -0500
Subject: Rename obj files to avoid accidental collisions

---
 Makefile | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

diff --git a/Makefile b/Makefile
index 6517c26b..5c1c8959 100644
--- a/Makefile
+++ b/Makefile
@@ -142,10 +142,19 @@ $(BUILD_DIR)/bin/$(EXE_FILE): $(STDLIB_OBJS) $(COMPILER_OBJS) | $(BUILD_DIR)/bin
 $(BUILD_DIR)/lib/$(AR_FILE): $(STDLIB_OBJS) build/gc/lib/libgc.a build/unistring/lib/libunistring.a build/gmp/lib/libgmp.a | $(BUILD_DIR)/lib
 	mkdir -p tmp; \
 	cd tmp; \
-	ar -x ../build/gc/lib/libgc.a; \
+	for f in $(STDLIB_OBJS); do \
+		cp ../$$f tomo_$$(basename $$f); \
+	done; \
+	mkdir -p gc; \
+	(cd gc && ar -x ../../build/gc/lib/libgc.a); \
+	for f in gc/*.o; do mv "$$f" gc_"$$(basename $$f)"; done; \
+	rmdir gc; \
+	mkdir -p gmp; \
+	(cd gmp && ar -x ../../build/gmp/lib/libgmp.a); \
+	for f in gmp/*.o; do mv "$$f" gmp_"$$(basename $$f)"; done; \
+	rmdir gmp; \
 	ar -x ../build/unistring/lib/libunistring.a; \
-	ar -x ../build/gmp/lib/libgmp.a; \
-	ar -rcs ../$@ $(addprefix ../,$(STDLIB_OBJS)) *.o
+	ar -rcs ../$@ *.o
 
 $(BUILD_DIR)/lib/tomo@$(TOMO_VERSION)/modules.ini: modules/core.ini modules/examples.ini | $(BUILD_DIR)/lib/tomo@$(TOMO_VERSION)
 	@cat $^ > $@
-- 
cgit v1.2.3