diff --git a/CMakeLists.txt b/CMakeLists.txt
index 99c469de75..126449cb14 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -141,12 +141,18 @@ function(mbed_set_mbed_target_linker_script target)
             WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
             BYPRODUCTS "${CMAKE_BINARY_DIR}/${target}.link_script.ld"
         )
+        target_link_options(mbed-core
+            INTERFACE
+                "-T" "${CMAKE_BINARY_DIR}/${target}.link_script.ld"
+                "-Wl,-Map=${CMAKE_BINARY_DIR}/${target}.map"
+        )
     elseif(MBED_TOOLCHAIN STREQUAL "ARM")
         set(CMAKE_PRE_BUILD_COMMAND COMMAND "")
         target_link_options(mbed-core
             INTERFACE
                 "--scatter=${mbed_target_linker_script}"
                 "--predefine=${_linker_preprocess_definitions}"
+                "--map"
         )
     endif()
     add_custom_command(
diff --git a/tools/cmake/toolchains/ARM.cmake b/tools/cmake/toolchains/ARM.cmake
index 1cd4c09da5..f3ea01393b 100644
--- a/tools/cmake/toolchains/ARM.cmake
+++ b/tools/cmake/toolchains/ARM.cmake
@@ -39,10 +39,6 @@ function(mbed_set_toolchain_options target)
             $<$<COMPILE_LANGUAGE:ASM>:--target=arm-arm-none-eabi -masm=auto>
     )
 
-    list(APPEND link_options
-        "--map"
-    )
-
     # Add linking time preprocessor macro for TFM targets
     if(MBED_CPU_CORE MATCHES "\-NS$")
         list(APPEND link_options
diff --git a/tools/cmake/toolchains/GCC_ARM.cmake b/tools/cmake/toolchains/GCC_ARM.cmake
index 9b9fa2062f..e2e09ef026 100644
--- a/tools/cmake/toolchains/GCC_ARM.cmake
+++ b/tools/cmake/toolchains/GCC_ARM.cmake
@@ -19,8 +19,6 @@ function(mbed_set_toolchain_options target)
             "-lnosys"
         "-Wl,--end-group"
         "-specs=nosys.specs"
-        "-T" "${CMAKE_BINARY_DIR}/${APP_TARGET}.link_script.ld"
-        "-Wl,-Map=${CMAKE_BINARY_DIR}/${APP_TARGET}.map"
         "-Wl,--cref"
     )