workaround: Rename EE patch output temporarily on build

ps2dev · Oct 6, 2024 · a594698 · a594698
1 parent 81af31d
commit a594698
Show file tree

Hide file tree

Showing 4 changed files with 28 additions and 4 deletions.
diff --git a/ee/kernel/src/eenull/Makefile b/ee/kernel/src/eenull/Makefile
@@ -26,6 +26,12 @@ clean:
 include $(PS2SDKSRC)/Defs.make
 include $(PS2SDKSRC)/ee/Rules.make
 
-$(EE_EENULL_ELF): $(EE_OBJS)
+.INTERMEDIATE:: $(EE_EENULL_ELF)_tmp$(MAKE_CURPID)
+
+$(EE_EENULL_ELF)_tmp$(MAKE_CURPID): $(EE_OBJS)
 	$(DIR_GUARD)
 	$(EE_CC) $(EE_CFLAGS) -o $@ $^ -nostdlib -nostartfiles -Tlinkfile -s $(EE_LIBS)
+
+$(EE_EENULL_ELF): $(EE_EENULL_ELF)_tmp$(MAKE_CURPID)
+	$(DIR_GUARD)
+	mv $< $@
diff --git a/ee/kernel/src/osdsrc/Makefile b/ee/kernel/src/osdsrc/Makefile
@@ -27,6 +27,12 @@ clean:
 include $(PS2SDKSRC)/Defs.make
 include $(PS2SDKSRC)/ee/Rules.make
 
-$(EE_OSDSRC_ELF): $(EE_OBJS)
+.INTERMEDIATE:: $(EE_OSDSRC_ELF)_tmp$(MAKE_CURPID)
+
+$(EE_OSDSRC_ELF)_tmp$(MAKE_CURPID): $(EE_OBJS)
 	$(DIR_GUARD)
 	$(EE_CC) $(EE_CFLAGS) -o $@ $^ -nostdlib -nostartfiles -Tlinkfile -s $(EE_LIBS)
+
+$(EE_OSDSRC_ELF): $(EE_OSDSRC_ELF)_tmp$(MAKE_CURPID)
+	$(DIR_GUARD)
+	mv $< $@
diff --git a/ee/kernel/src/srcfile/Makefile b/ee/kernel/src/srcfile/Makefile
@@ -26,6 +26,12 @@ clean:
 include $(PS2SDKSRC)/Defs.make
 include $(PS2SDKSRC)/ee/Rules.make
 
-$(EE_SRCFILE_ELF): $(EE_OBJS)
+.INTERMEDIATE:: $(EE_SRCFILE_ELF)_tmp$(MAKE_CURPID)
+
+$(EE_SRCFILE_ELF)_tmp$(MAKE_CURPID): $(EE_OBJS)
 	$(DIR_GUARD)
 	$(EE_CC) $(EE_CFLAGS) -o $@ $^ -nostdlib -nostartfiles -Tlinkfile -s $(EE_LIBS)
+
+$(EE_SRCFILE_ELF): $(EE_SRCFILE_ELF)_tmp$(MAKE_CURPID)
+	$(DIR_GUARD)
+	mv $< $@
diff --git a/ee/kernel/src/tlbsrc/Makefile b/ee/kernel/src/tlbsrc/Makefile
@@ -27,6 +27,12 @@ clean:
 include $(PS2SDKSRC)/Defs.make
 include $(PS2SDKSRC)/ee/Rules.make
 
-$(EE_TLBSRC_ELF): $(EE_OBJS)
+.INTERMEDIATE:: $(EE_TLBSRC_ELF)_tmp$(MAKE_CURPID)
+
+$(EE_TLBSRC_ELF)_tmp$(MAKE_CURPID): $(EE_OBJS)
 	$(DIR_GUARD)
 	$(EE_CC) $(EE_CFLAGS) -o $@ $^ -nostdlib -nostartfiles -Tlinkfile -s $(EE_LIBS)
+
+$(EE_TLBSRC_ELF): $(EE_TLBSRC_ELF)_tmp$(MAKE_CURPID)
+	$(DIR_GUARD)
+	mv $< $@