Merge pull request #62 from CreeperMario/escape-paths

wut-toolchain: Properly escape include/lib paths
This commit is contained in:
James 2018-01-11 02:37:17 -08:00 committed by GitHub
commit da8975303c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -45,27 +45,27 @@ set(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY)
set(CMAKE_FIND_ROOT_PATH_MODE_PACKAGE ONLY) set(CMAKE_FIND_ROOT_PATH_MODE_PACKAGE ONLY)
set(DEVKIT_COMPILE_FLAGS "-mcpu=750 -meabi -mhard-float -mno-sdata") 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_COMPILE_FLAGS "${DEVKIT_COMPILE_FLAGS}")
set(RPX_LINKER_FLAGS "\ set(RPX_LINKER_FLAGS "\
${DEVKIT_LINKER_FLAGS} \ ${DEVKIT_LINKER_FLAGS} \
-pie -fPIE -z common-page-size=64 -z max-page-size=64 -T ${WUT_ROOT}/rules/rpl.ld\ -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") \"-L${WUT_ROOT}/lib\" -Wl,-wrap,__eabi")
set(ELF_TO_RPL ${WUT_ROOT}/bin/elf2rpl${CMAKE_EXECUTABLE_SUFFIX}) set(ELF_TO_RPL ${WUT_ROOT}/bin/elf2rpl${CMAKE_EXECUTABLE_SUFFIX})
if(CMAKE_INCLUDE_PATH) if(CMAKE_INCLUDE_PATH)
set(RPX_COMPILE_FLAGS "\ set(RPX_COMPILE_FLAGS "\
${RPX_COMPILE_FLAGS} \ ${RPX_COMPILE_FLAGS} \
-I${CMAKE_INCLUDE_PATH}") \"-I${CMAKE_INCLUDE_PATH}\"")
endif() endif()
if(CMAKE_LIBRARY_PATH) if(CMAKE_LIBRARY_PATH)
set(RPX_LINKER_FLAGS "\ set(RPX_LINKER_FLAGS "\
${RPX_LINKER_FLAGS} \ ${RPX_LINKER_FLAGS} \
-L${CMAKE_LIBRARY_PATH}") \"-L${CMAKE_LIBRARY_PATH}\"")
endif() endif()
macro(add_rpx target) macro(add_rpx target)