mirror of
https://github.com/zeldaret/oot
synced 2026-07-10 23:12:08 -04:00
Force string.o to be in boot for gcc builds (#1948)
In retail builds, memcpy is linked in code, not boot, but GCC likes to call memcpy when copying structs so currently GCC builds immediately crash in __osInitialize_common.
This commit is contained in:
@@ -66,7 +66,7 @@ beginseg
|
||||
#endif
|
||||
include "$(BUILD_DIR)/src/libultra/os/unmaptlball.o"
|
||||
include "$(BUILD_DIR)/src/libultra/io/epidma.o"
|
||||
#if OOT_DEBUG
|
||||
#if OOT_DEBUG || COMPILER_GCC
|
||||
include "$(BUILD_DIR)/src/libultra/libc/string.o"
|
||||
#endif
|
||||
include "$(BUILD_DIR)/src/libultra/os/invalicache.o"
|
||||
@@ -532,6 +532,8 @@ beginseg
|
||||
include "$(BUILD_DIR)/src/libultra/gu/lookathil.o"
|
||||
#if !OOT_DEBUG
|
||||
include "$(BUILD_DIR)/src/libultra/libc/xprintf.o"
|
||||
#endif
|
||||
#if !OOT_DEBUG && !COMPILER_GCC
|
||||
include "$(BUILD_DIR)/src/libultra/libc/string.o"
|
||||
#endif
|
||||
include "$(BUILD_DIR)/src/libultra/io/sp.o"
|
||||
|
||||
Reference in New Issue
Block a user