Skip to content

Commit

Permalink
cmake: add toolchain_ld_<name> macros to FindDeprecated
Browse files Browse the repository at this point in the history
Follow-up: zephyrproject-rtos#77887

The macros:
- toolchain_ld_base
- toolchain_ld_baremetal
- toolchain_ld_cpp

was deprecated in 5db1f1a but no check
was added to FindDeprecated.cmake, meaning toolchains still providing
those macros was not getting a proper deprecation warning.

Signed-off-by: Torsten Rasmussen <[email protected]>
  • Loading branch information
tejlmand committed Sep 12, 2024
1 parent 9559996 commit 135d9fc
Showing 1 changed file with 48 additions and 0 deletions.
48 changes: 48 additions & 0 deletions cmake/modules/FindDeprecated.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -99,6 +99,54 @@ if("PYTHON_PREFER" IN_LIST Deprecated_FIND_COMPONENTS)
endif()
endif()

if("toolchain_ld_base" IN_LIST Deprecated_FIND_COMPONENTS)
# This code was deprecated after Zephyr v4.0.0
list(REMOVE_ITEM Deprecated_FIND_COMPONENTS toolchain_ld_base)

if(COMMAND toolchain_ld_base)
message(DEPRECATION
"The macro/function 'toolchain_ld_base' is deprecated. "
"Please use '${LINKER}/linker_flags.cmake' and define the appropriate "
"linker flags as properties instead. "
"See '${ZEPHYR_BASE}/cmake/linker/linker_flags_template.cmake' for "
" known linker properties."
)
toolchain_ld_base()
endif()
endif()

if("toolchain_ld_baremetal" IN_LIST Deprecated_FIND_COMPONENTS)
# This code was deprecated after Zephyr v4.0.0
list(REMOVE_ITEM Deprecated_FIND_COMPONENTS toolchain_ld_baremetal)

if(COMMAND toolchain_ld_baremetal)
message(DEPRECATION
"The macro/function 'toolchain_ld_baremetal' is deprecated. "
"Please use '${LINKER}/linker_flags.cmake' and define the appropriate "
"linker flags as properties instead. "
"See '${ZEPHYR_BASE}/cmake/linker/linker_flags_template.cmake' for "
" known linker properties."
)
toolchain_ld_baremetal()
endif()
endif()

if("toolchain_ld_cpp" IN_LIST Deprecated_FIND_COMPONENTS)
# This code was deprecated after Zephyr v4.0.0
list(REMOVE_ITEM Deprecated_FIND_COMPONENTS toolchain_ld_cpp)

if(COMMAND toolchain_ld_cpp)
message(DEPRECATION
"The macro/function 'toolchain_ld_cpp' is deprecated. "
"Please use '${LINKER}/linker_flags.cmake' and define the appropriate "
"linker flags as properties instead. "
"See '${ZEPHYR_BASE}/cmake/linker/linker_flags_template.cmake' for "
" known linker properties."
)
toolchain_ld_cpp()
endif()
endif()

if(NOT "${Deprecated_FIND_COMPONENTS}" STREQUAL "")
message(STATUS "The following deprecated component(s) could not be found: "
"${Deprecated_FIND_COMPONENTS}")
Expand Down

0 comments on commit 135d9fc

Please sign in to comment.