michaelh/zephyr
1
0
Fork 0
Code Releases Activity

cmake: remove base_name for dep file

Browse source 
With CMake 3.20 relative path inside DEPFILEs are treated relative to
CMAKE_CURRENT_BINARY_DIR and are transformed by CMake in its internal
dep file.

Therefore Zephyr build system must no longer add `base_name` to the
`-MT` argument for the preprocessor.

Signed-off-by: Torsten Rasmussen <Torsten.Rasmussen@nordicsemi.no>
This commit is contained in:
Torsten Rasmussen 2022-01-07 10:59:03 +01:00 • committed by Maureen Helm
commit a0ba67df63
1 changed files with 1 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

3
cmake/linker/ld/target.cmake
View file

@ -67,7 +67,6 @@ macro(configure_linker_script linker_script_gen linker_pass_define)
endif()
zephyr_get_include_directories_for_lang(C current_includes)
get_filename_component(base_name ${CMAKE_CURRENT_BINARY_DIR} NAME)
get_property(current_defines GLOBAL PROPERTY PROPERTY_LINKER_SCRIPT_DEFINES)
add_custom_command(
@ -81,7 +80,7 @@ macro(configure_linker_script linker_script_gen linker_pass_define)
COMMAND ${CMAKE_C_COMPILER}
-x assembler-with-cpp
${NOSYSDEF_CFLAG}
-MD -MF ${linker_script_gen}.dep -MT ${base_name}/${linker_script_gen}
-MD -MF ${linker_script_gen}.dep -MT ${linker_script_gen}
-D_LINKER
-D_ASMLANGUAGE
-imacros ${AUTOCONF_H}