From d6422bd606a6b530efb61825859a6591cad86326 Mon Sep 17 00:00:00 2001
From: CrashOveride95 <40003130+CrashOveride95@users.noreply.github.com>
Date: Thu, 4 Sep 2025 19:16:21 -0400
Subject: [PATCH 1/2] Clean toolchain check in Makefile

Adds a few more toolchains while at the same time cleaning how the makefile checks for toolchains in the first place (Avoids endif spam)
---
 Makefile | 38 ++++++++++++++++----------------------
 1 file changed, 16 insertions(+), 22 deletions(-)

diff --git a/Makefile b/Makefile
index 8198055..d75c9d5 100644
--- a/Makefile
+++ b/Makefile
@@ -34,32 +34,26 @@ ifeq ($(PARENT_OUTPUT_DIR),.)
 endif
 
 # Find the N64 toolchain, for creating object files.
-ifneq (, $(shell which mips64-linux-gnuabi64-as))
-  AS := mips64-linux-gnuabi64-as
-else
-ifneq (, $(shell which mips64-linux-gnu-as))
-  AS := mips64-linux-gnu-as
-else
-ifneq (, $(shell which mips64-ultra-elf-as))
-  AS := mips64-ultra-elf-as
-else
-ifneq (, $(shell which mips64-elf-as))
-  AS := mips64-elf-as
-else
-ifneq (, $(shell which mips64-as))
-  AS := mips64-as
-else
-ifneq (, $(shell which mips-linux-gnu-as))
-  AS := mips-linux-gnu-as
+ifneq (, $(shell which mips64-elf-ld)
+  CROSS := mips64-elf-
+else ifneq (, $(shell which mips-n64-ld)
+  CROSS := mips-n64-
+else ifneq (, $(shell which mips64-ld)
+  CROSS := mips64-
+else ifneq (, $(shell which mips-linux-gnu-ld)
+  CROSS := mips-linux-gnu-
+else ifneq (, $(shell which mips64-linux-gnu-ld)
+  CROSS := mips64-linux-gnu-
+else ifneq (, $(shell which mips-ld)
+  CROSS := mips-
+else ifneq (, $(shell which mips64-linux-gnuabi64-ld)
+  CROSS := mips64-linux-gnuabi64-
+else ifneq (, $(shell which mips64-ultra-elf-ld)
+  CROSS := mips64-ultra-elf-
 else
   $(warning Could not find N64 linker, not building object files)
   AS := 
 endif
-endif
-endif
-endif
-endif
-endif
 
 NO_COL := \033[0m
 RED    := \033[0;31m

From c79f801c8241fbf4eb71351a567c6df1155d3f4e Mon Sep 17 00:00:00 2001
From: CrashOveride95 <40003130+CrashOveride95@users.noreply.github.com>
Date: Sat, 6 Sep 2025 17:14:48 -0400
Subject: [PATCH 2/2] Fix typos in makefile caused by Sleepy Crashoveride

---
 Makefile | 34 +++++++++++++++++-----------------
 1 file changed, 17 insertions(+), 17 deletions(-)

diff --git a/Makefile b/Makefile
index d75c9d5..6e5f596 100644
--- a/Makefile
+++ b/Makefile
@@ -34,24 +34,24 @@ ifeq ($(PARENT_OUTPUT_DIR),.)
 endif
 
 # Find the N64 toolchain, for creating object files.
-ifneq (, $(shell which mips64-elf-ld)
-  CROSS := mips64-elf-
-else ifneq (, $(shell which mips-n64-ld)
-  CROSS := mips-n64-
-else ifneq (, $(shell which mips64-ld)
-  CROSS := mips64-
-else ifneq (, $(shell which mips-linux-gnu-ld)
-  CROSS := mips-linux-gnu-
-else ifneq (, $(shell which mips64-linux-gnu-ld)
-  CROSS := mips64-linux-gnu-
-else ifneq (, $(shell which mips-ld)
-  CROSS := mips-
-else ifneq (, $(shell which mips64-linux-gnuabi64-ld)
-  CROSS := mips64-linux-gnuabi64-
-else ifneq (, $(shell which mips64-ultra-elf-ld)
-  CROSS := mips64-ultra-elf-
+ifneq (, $(shell which mips64-elf-as)
+  AS := mips64-elf-as
+else ifneq (, $(shell which mips-n64-as)
+  AS := mips-n64-as
+else ifneq (, $(shell which mips64-as)
+  AS := mips64-as
+else ifneq (, $(shell which mips-linux-gnu-as)
+  AS := mips-linux-gnu-as
+else ifneq (, $(shell which mips64-linux-gnu-as)
+  AS := mips64-linux-gnu-as
+else ifneq (, $(shell which mips-as)
+  AS := mips-as
+else ifneq (, $(shell which mips64-linux-gnuabi64-as)
+  AS := mips64-linux-gnuabi64-as
+else ifneq (, $(shell which mips64-ultra-elf-as)
+  AS := mips64-ultra-elf-as
 else
-  $(warning Could not find N64 linker, not building object files)
+  $(warning Could not find N64 assembler, not building object files)
   AS := 
 endif