ARMmbed
/
mbed-os
mirror of https://github.com/ARMmbed/mbed-os.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #13928 from hugueskamba/hk_cmake_clean_arm_toolchain_support 

Clean remnant of experiment with ARM toolchain
pull/13957/head
Martin Kojtal 2020-11-24 14:11:26 +00:00 committed by GitHub
parent 985fab4ea0 62be4efb6c
commit 50262876c6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 0 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
tools/cmake/toolchains/ARM.cmake
View File

@ -8,16 +8,9 @@ set(CMAKE_AR "armar")
set(ARM_ELF2BIN "fromelf") set(ARM_ELF2BIN "fromelf")
set_property(GLOBAL PROPERTY ELF2BIN ${ARM_ELF2BIN}) set_property(GLOBAL PROPERTY ELF2BIN ${ARM_ELF2BIN})
option(MBEDIDE "Use Arm compiler from Mbed Studio" OFF)
if(MBEDIDE)
set_property(GLOBAL PROPERTY MBED_STUDIO_ARM_COMPILER "--ide=mbed")
endif()
# Sets toolchain options # Sets toolchain options
function(mbed_set_toolchain_options target) function(mbed_set_toolchain_options target)
get_property(mbed_studio_arm_compiler GLOBAL PROPERTY MBED_STUDIO_ARM_COMPILER)
list(APPEND common_options list(APPEND common_options
"${mbed_studio_arm_compiler}"
"-c" "-c"
"--target=arm-arm-none-eabi" "--target=arm-arm-none-eabi"
"-mthumb" "-mthumb"
@ -44,11 +37,9 @@ function(mbed_set_toolchain_options target)
target_compile_options(${target} target_compile_options(${target}
INTERFACE INTERFACE
$<$<COMPILE_LANGUAGE:ASM>:--target=arm-arm-none-eabi -masm=auto> $<$<COMPILE_LANGUAGE:ASM>:--target=arm-arm-none-eabi -masm=auto>
$<$<COMPILE_LANGUAGE:ASM>:${MBED_STUDIO_ARM_COMPILER}>
) )
list(APPEND link_options list(APPEND link_options
"${MBED_STUDIO_ARM_COMPILER}"
"--map" "--map"
) )