Skip to content

Commit 0b0f2f1

Browse files
tejlmandfabiobaltieri
authored andcommitted
cmake: safeguard path of SOC_LINKER_SCRIPT
Issue reported on Discord. Safeguard cmake_path() for SOC_LINKER_SCRIPT so that the path is only processed when SOC_LINKER_SCRIPT is defined. Signed-off-by: Torsten Rasmussen <[email protected]>
1 parent 8ba8c18 commit 0b0f2f1

File tree

1 file changed

+5
-2
lines changed

1 file changed

+5
-2
lines changed

cmake/linker/ld/target.cmake

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,10 @@ macro(configure_linker_script linker_script_gen linker_pass_define)
5757

5858
zephyr_get_include_directories_for_lang(C current_includes)
5959
get_property(current_defines GLOBAL PROPERTY PROPERTY_LINKER_SCRIPT_DEFINES)
60-
cmake_path(GET SOC_LINKER_SCRIPT PARENT_PATH soc_linker_script_includes)
60+
if(DEFINED SOC_LINKER_SCRIPT)
61+
cmake_path(GET SOC_LINKER_SCRIPT PARENT_PATH soc_linker_script_includes)
62+
set(soc_linker_script_includes -I${soc_linker_script_includes})
63+
endif()
6164

6265
add_custom_command(
6366
OUTPUT ${linker_script_gen}
@@ -75,7 +78,7 @@ macro(configure_linker_script linker_script_gen linker_pass_define)
7578
-D_ASMLANGUAGE
7679
-imacros ${AUTOCONF_H}
7780
${current_includes}
78-
-I${soc_linker_script_includes}
81+
${soc_linker_script_includes}
7982
${current_defines}
8083
${template_script_defines}
8184
-E ${LINKER_SCRIPT}

0 commit comments

Comments
 (0)