From f2938470141c2a3469521577e2811c4b78dbb926 Mon Sep 17 00:00:00 2001
From: Ryan Dwyer <ryandwyer1@gmail.com>
Date: Sun, 7 Feb 2021 21:17:11 +1000
Subject: [PATCH] Fix race condition when building -O3 files in parallel

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

diff --git a/Makefile b/Makefile
index 286b31da3..2e89de146 100644
--- a/Makefile
+++ b/Makefile
@@ -417,6 +417,18 @@ $(B_DIR)/lib/ultra/libc/ll.o: src/lib/ultra/libc/ll.c
 	$(IDOCC) -c $(CFLAGS) $< -o $@
 	tools/patchmips3 $@ || rm $@
 
+# Files that use -O3 must be compiled without the ASM processor, otherwise it
+# introduces a race condition when using make -j because they create a temporary
+# include-stdin.u file during compilation.
+$(B_DIR)/lib/ultra/gu/frustum.o: src/lib/ultra/gu/frustum.c
+	$(IDOCC) -c $(CFLAGS) $< -o $@
+
+$(B_DIR)/lib/ultra/gu/ortho.o: src/lib/ultra/gu/ortho.c
+	$(IDOCC) -c $(CFLAGS) $< -o $@
+
+$(B_DIR)/lib/ultra/gu/scale.o: src/lib/ultra/gu/scale.c
+	$(IDOCC) -c $(CFLAGS) $< -o $@
+
 $(B_DIR)/lib/%.o: src/lib/%.c
 	@mkdir -p $(dir $@)
 	/usr/bin/env python3 tools/asmpreproc/asm-processor.py -O2 $< | $(IDOCC) -c $(CFLAGS) tools/asmpreproc/include-stdin.c -o $@