Skip to content

Commit 9b876bb

Browse files
authored
Fix location of map file on Ninja (#2584)
1 parent 2afa251 commit 9b876bb

File tree

1 file changed

+2
-3
lines changed

1 file changed

+2
-3
lines changed

src/CMakeLists.txt

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -74,12 +74,11 @@ endfunction()
7474

7575
# add map file generation for the given target
7676
function(pico_add_map_output TARGET)
77-
pico_get_runtime_output_directory(${TARGET} output_path)
7877
get_target_property(target_type ${TARGET} TYPE)
7978
if ("EXECUTABLE" STREQUAL "${target_type}")
80-
target_link_options(${TARGET} PRIVATE "LINKER:-Map=${output_path}$<IF:$<BOOL:$<TARGET_PROPERTY:OUTPUT_NAME>>,$<TARGET_PROPERTY:OUTPUT_NAME>,$<TARGET_PROPERTY:NAME>>${CMAKE_EXECUTABLE_SUFFIX}.map")
79+
target_link_options(${TARGET} PRIVATE "LINKER:-Map=$<TARGET_FILE:${TARGET}>.map")
8180
else ()
82-
target_link_options(${TARGET} INTERFACE "LINKER:-Map=${output_path}$<IF:$<BOOL:$<TARGET_PROPERTY:OUTPUT_NAME>>,$<TARGET_PROPERTY:OUTPUT_NAME>,$<TARGET_PROPERTY:NAME>>${CMAKE_EXECUTABLE_SUFFIX}.map")
81+
target_link_options(${TARGET} INTERFACE "LINKER:-Map=$<TARGET_FILE:${TARGET}>.map")
8382
endif ()
8483
endfunction()
8584

0 commit comments

Comments
 (0)