From 7055d69c4faebca4e14a25d9f61899dbbdb095f0 Mon Sep 17 00:00:00 2001 From: rw-r-r-0644 Date: Tue, 6 Nov 2018 20:21:40 +0100 Subject: [PATCH] Strip debug sections before running elf2rpl to prevent crashes --- share/wut.cmake | 1 + share/wut.toolchain.cmake | 11 ++++++----- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/share/wut.cmake b/share/wut.cmake index 37cd3e7b..1b20f9df 100644 --- a/share/wut.cmake +++ b/share/wut.cmake @@ -86,6 +86,7 @@ function(wut_create_rpl target source) coreinit) add_custom_target(${target} ALL + COMMAND ${CMAKE_STRIP} -g ${source} COMMAND ${WUT_ELF2RPL} ${ELF2RPL_FLAGS} ${source} ${target} DEPENDS ${source} COMMENT "Converting to RPX ${target}") diff --git a/share/wut.toolchain.cmake b/share/wut.toolchain.cmake index f029f6e1..6510833a 100644 --- a/share/wut.toolchain.cmake +++ b/share/wut.toolchain.cmake @@ -16,11 +16,12 @@ endif() set(DEVKITPPC $ENV{DEVKITPPC}) set(WUT_ROOT $ENV{WUT_ROOT}) -set(CMAKE_ASM_COMPILER "${DEVKITPPC}/bin/powerpc-eabi-gcc${CMAKE_EXECUTABLE_SUFFIX}" CACHE PATH "") -set(CMAKE_C_COMPILER "${DEVKITPPC}/bin/powerpc-eabi-gcc${CMAKE_EXECUTABLE_SUFFIX}" CACHE PATH "") -set(CMAKE_CXX_COMPILER "${DEVKITPPC}/bin/powerpc-eabi-g++${CMAKE_EXECUTABLE_SUFFIX}" CACHE PATH "") -set(CMAKE_LINKER "${DEVKITPPC}/bin/powerpc-eabi-ld${CMAKE_EXECUTABLE_SUFFIX}" CACHE PATH "") -set(CMAKE_AR "${DEVKITPPC}/bin/powerpc-eabi-ar${CMAKE_EXECUTABLE_SUFFIX}" CACHE PATH "") +set(CMAKE_ASM_COMPILER "${DEVKITPPC}/bin/powerpc-eabi-gcc${CMAKE_EXECUTABLE_SUFFIX}" CACHE PATH "") +set(CMAKE_C_COMPILER "${DEVKITPPC}/bin/powerpc-eabi-gcc${CMAKE_EXECUTABLE_SUFFIX}" CACHE PATH "") +set(CMAKE_CXX_COMPILER "${DEVKITPPC}/bin/powerpc-eabi-g++${CMAKE_EXECUTABLE_SUFFIX}" CACHE PATH "") +set(CMAKE_LINKER "${DEVKITPPC}/bin/powerpc-eabi-ld${CMAKE_EXECUTABLE_SUFFIX}" CACHE PATH "") +set(CMAKE_AR "${DEVKITPPC}/bin/powerpc-eabi-ar${CMAKE_EXECUTABLE_SUFFIX}" CACHE PATH "") +set(CMAKE_STRIP "${DEVKITPPC}/bin/powerpc-eabi-strip${CMAKE_EXECUTABLE_SUFFIX}" CACHE PATH "") set(WUT_C_FLAGS "-mcpu=750 -meabi -mhard-float -Wl,-q \"-I${WUT_ROOT}/include\" -D__WIIU__ -D__WUT__") set(CMAKE_C_FLAGS "${WUT_C_FLAGS}" CACHE STRING "")