From 7dd128fe94cbfa0f88e84e9331dbfe99a3243f59 Mon Sep 17 00:00:00 2001 From: CreeperMario Date: Sat, 23 Dec 2017 09:37:32 +1030 Subject: [PATCH] wut-toolchain: Properly escape include/lib paths * This allows WUT to successfully operate within a path that contains spaces. --- cmake/wut-toolchain.cmake | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/cmake/wut-toolchain.cmake b/cmake/wut-toolchain.cmake index 5ef2410..9da8b42 100644 --- a/cmake/wut-toolchain.cmake +++ b/cmake/wut-toolchain.cmake @@ -45,27 +45,27 @@ set(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY) set(CMAKE_FIND_ROOT_PATH_MODE_PACKAGE ONLY) set(DEVKIT_COMPILE_FLAGS "-mcpu=750 -meabi -mhard-float -mno-sdata") -set(DEVKIT_LINKER_FLAGS "-nostartfiles -L${DEVKITPPC}/lib") +set(DEVKIT_LINKER_FLAGS "-nostartfiles \"-L${DEVKITPPC}/lib\"") set(RPX_COMPILE_FLAGS "${DEVKIT_COMPILE_FLAGS}") set(RPX_LINKER_FLAGS "\ ${DEVKIT_LINKER_FLAGS} \ - -pie -fPIE -z common-page-size=64 -z max-page-size=64 -T ${WUT_ROOT}/rules/rpl.ld\ - -L${WUT_ROOT}/lib -Wl,-wrap,__eabi") + -pie -fPIE -z common-page-size=64 -z max-page-size=64 -T \"${WUT_ROOT}/rules/rpl.ld\"\ + \"-L${WUT_ROOT}/lib\" -Wl,-wrap,__eabi") set(ELF_TO_RPL ${WUT_ROOT}/bin/elf2rpl${CMAKE_EXECUTABLE_SUFFIX}) if(CMAKE_INCLUDE_PATH) set(RPX_COMPILE_FLAGS "\ ${RPX_COMPILE_FLAGS} \ - -I${CMAKE_INCLUDE_PATH}") + \"-I${CMAKE_INCLUDE_PATH}\"") endif() if(CMAKE_LIBRARY_PATH) set(RPX_LINKER_FLAGS "\ ${RPX_LINKER_FLAGS} \ - -L${CMAKE_LIBRARY_PATH}") + \"-L${CMAKE_LIBRARY_PATH}\"") endif() macro(add_rpx target)