diff --git a/cmake/app.cmake b/cmake/app.cmake index 73c983e574..3a3cb37015 100644 --- a/cmake/app.cmake +++ b/cmake/app.cmake @@ -64,9 +64,9 @@ if(MBED_TOOLCHAIN STREQUAL "GCC_ARM") ) elseif(MBED_TOOLCHAIN STREQUAL "ARM") set(CMAKE_POST_BUILD_COMMAND - COMMAND ${ELF2BIN} --bin -o $.bin $ + COMMAND ${ELF2BIN} ${MBED_STUDIO_ARM_COMPILER} --bin -o $.bin $ COMMAND ${CMAKE_COMMAND} -E echo "-- built: $.bin" - COMMAND ${ELF2BIN} --i32combined -o $.hex $ + COMMAND ${ELF2BIN} ${MBED_STUDIO_ARM_COMPILER} --i32combined -o $.hex $ COMMAND ${CMAKE_COMMAND} -E echo "-- built: $.hex" ) elseif(MBED_TOOLCHAIN STREQUAL "IAR") diff --git a/cmake/toolchain.cmake b/cmake/toolchain.cmake index 95cb0d76f6..78ca9a3bf0 100644 --- a/cmake/toolchain.cmake +++ b/cmake/toolchain.cmake @@ -1,4 +1,8 @@ # Copyright (c) 2020 ARM Limited. All rights reserved. # SPDX-License-Identifier: Apache-2.0 +option(MBEDIDE "Use Arm compiler from Mbed Studio" OFF) +if(MBEDIDE) + set(MBED_STUDIO_ARM_COMPILER "--ide=mbed") +endif() include(${MBED_ROOT}/cmake/toolchains/${MBED_TOOLCHAIN}.cmake) diff --git a/cmake/toolchains/ARM.cmake b/cmake/toolchains/ARM.cmake index 5231c96f5f..be75b3c1d2 100644 --- a/cmake/toolchains/ARM.cmake +++ b/cmake/toolchains/ARM.cmake @@ -7,6 +7,7 @@ set(CMAKE_CXX_COMPILER "armclang") set(CMAKE_AR "armar") set(ELF2BIN "fromelf") set(COMMON_FLAGS " \ + ${MBED_STUDIO_ARM_COMPILER} \ -c \ --target=arm-arm-none-eabi \ -Oz \ @@ -26,9 +27,13 @@ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} \ ${COMMON_FLAGS} \ ") set(CMAKE_ASM_FLAGS "${CMAKE_ASM_FLAGS} \ + ${MBED_STUDIO_ARM_COMPILER} \ --cpreproc \ --cpreproc_opts=--target=arm-arm-none-eabi,-mcpu=cortex-m4,-D,__FPU_PRESENT,-D,MBED_CONF_PLATFORM_CRASH_CAPTURE_ENABLED \ ") +set(CMAKE_CXX_LINK_FLAGS "${CMAKE_CXX_LINK_FLAGS} \ + ${MBED_STUDIO_ARM_COMPILER} \ +") add_definitions( -DTOOLCHAIN_ARM