From 1549f34e8e8e0211d7f6cc672b0ac7f4125d6e03 Mon Sep 17 00:00:00 2001
From: cadmic <cadmic24@gmail.com>
Date: Fri, 10 Jan 2025 15:05:10 -0800
Subject: [PATCH] [iQue] Update permuter/decompme import (#2415)

* [iQue] Update permuter/decompme import

* Fix GCC build
---
 Makefile                     | 3 ++-
 tools/permuter_settings.toml | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/Makefile b/Makefile
index d0524f0b8b..70105ac6d5 100644
--- a/Makefile
+++ b/Makefile
@@ -225,7 +225,6 @@ endif
 VERSION_MACRO := $(shell echo $(VERSION) | tr a-z-. A-Z__)
 CPP_DEFINES += -DOOT_VERSION=$(VERSION_MACRO) -DOOT_REVISION=$(REVISION)
 CPP_DEFINES += -DOOT_REGION=REGION_$(REGION)
-CPP_DEFINES += -DBUILD_CREATOR="\"$(BUILD_CREATOR)\"" -DBUILD_DATE="\"$(BUILD_DATE)\"" -DBUILD_TIME="\"$(BUILD_TIME)\""
 CPP_DEFINES += -DLIBULTRA_VERSION=LIBULTRA_VERSION_$(LIBULTRA_VERSION)
 CPP_DEFINES += -DLIBULTRA_PATCH=$(LIBULTRA_PATCH)
 ifeq ($(PLATFORM),IQUE)
@@ -534,6 +533,8 @@ $(shell mkdir -p $(foreach dir, \
                     $(dir:$(EXTRACTED_DIR)/%=$(BUILD_DIR)/%)))
 endif
 
+$(BUILD_DIR)/src/boot/build.o: CPP_DEFINES += -DBUILD_CREATOR="\"$(BUILD_CREATOR)\"" -DBUILD_DATE="\"$(BUILD_DATE)\"" -DBUILD_TIME="\"$(BUILD_TIME)\""
+
 ifeq ($(COMPILER),ido)
 $(BUILD_DIR)/src/boot/driverominit.o: OPTFLAGS := -O2
 
diff --git a/tools/permuter_settings.toml b/tools/permuter_settings.toml
index 557e748cda..b168afec86 100644
--- a/tools/permuter_settings.toml
+++ b/tools/permuter_settings.toml
@@ -33,4 +33,4 @@ ACTOR_DEBUG_PRINTF = "void"
 [decompme.compilers]
 "tools/ido_recomp/*/7.1/cc" = "ido7.1"
 "tools/ido_recomp/*/5.3/cc" = "ido5.3"
-"tools/egcs/*/gcc" = "egcs_1.1.2-4"
+"tools/egcs/*/gcc" = "egcs_1.1.2-4c"