From 72ae87d1cab384b747e84b4d8b3a2f57c3cf11dd Mon Sep 17 00:00:00 2001 From: Jon Daniel Date: Mon, 29 Mar 2021 23:19:33 +0000 Subject: [PATCH 1/2] Add mips64-ld to support glankk/n64 --- Makefile | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Makefile b/Makefile index 4c4a4d821..a5069b2e9 100644 --- a/Makefile +++ b/Makefile @@ -328,6 +328,8 @@ DEP_FILES := $(O_FILES:.o=.d) $(LIBZ_O_FILES:.o=.d) $(GODDARD_O_FILES:.o=.d) $(B # detect prefix for MIPS toolchain ifneq ($(call find-command,mips64-elf-ld),) CROSS := mips64-elf- +else ifneq ($(call find-command,mips64-ld),) + CROSS := mips64- else ifneq ($(call find-command,mips-n64-ld),) CROSS := mips-n64- else ifneq ($(call find-command,mips-linux-gnu-ld),) From 05289c851b867cfd38e850aa645abcf76815ab26 Mon Sep 17 00:00:00 2001 From: Jon Daniel Date: Mon, 29 Mar 2021 23:27:16 +0000 Subject: [PATCH 2/2] Change order of compiler prefix and add more --- Makefile | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index a5069b2e9..7f199bc70 100644 --- a/Makefile +++ b/Makefile @@ -328,14 +328,16 @@ DEP_FILES := $(O_FILES:.o=.d) $(LIBZ_O_FILES:.o=.d) $(GODDARD_O_FILES:.o=.d) $(B # detect prefix for MIPS toolchain ifneq ($(call find-command,mips64-elf-ld),) CROSS := mips64-elf- -else ifneq ($(call find-command,mips64-ld),) - CROSS := mips64- else ifneq ($(call find-command,mips-n64-ld),) CROSS := mips-n64- +else ifneq ($(call find-command,mips64-ld),) + CROSS := mips64- else ifneq ($(call find-command,mips-linux-gnu-ld),) CROSS := mips-linux-gnu- else ifneq ($(call find-command,mips64-linux-gnu-ld),) CROSS := mips64-linux-gnu- +else ifneq ($(call find-command,mips-ld),) + CROSS := mips- else $(error Unable to detect a suitable MIPS toolchain installed) endif