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-03-14 15:25:22 +01:00 • committed by Carles Cufí
commit a199291ddc
2 changed files with 2 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -30,7 +30,6 @@ macro(configure_linker_script linker_script_gen linker_pass_define)
endif() endif()
zephyr_get_include_directories_for_lang(C current_includes) 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) get_property(current_defines GLOBAL PROPERTY PROPERTY_LINKER_SCRIPT_DEFINES)
# the command to generate linker file from template # the command to generate linker file from template
@ -46,7 +45,7 @@ macro(configure_linker_script linker_script_gen linker_pass_define)
-x c -x c
${NOSYSDEF_CFLAG} ${NOSYSDEF_CFLAG}
-Hnocopyr -Hnocopyr
-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_LINKER
-D_ASMLANGUAGE -D_ASMLANGUAGE
-imacros ${AUTOCONF_H} -imacros ${AUTOCONF_H}

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

@ -29,7 +29,6 @@ macro(configure_linker_script linker_script_gen linker_pass_define)
endif() endif()
zephyr_get_include_directories_for_lang(C current_includes) 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) get_property(current_defines GLOBAL PROPERTY PROPERTY_LINKER_SCRIPT_DEFINES)
add_custom_command( add_custom_command(
@ -42,7 +41,7 @@ macro(configure_linker_script linker_script_gen linker_pass_define)
COMMAND ${CMAKE_C_COMPILER} COMMAND ${CMAKE_C_COMPILER}
-x assembler-with-cpp -x assembler-with-cpp
${NOSYSDEF_CFLAG} ${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_LINKER
-D_ASMLANGUAGE -D_ASMLANGUAGE
${current_includes} ${current_includes}