Skip to content

Commit a9d85ae

Browse files
committed
cmake: Deprecate 'xtools' toolchain variant
The `xtools` toolchain variant (aka. Crosstool-NG) was originally introduced to be used with the Crosstool-NG-based Zephyr SDK toolchains (i.e. sdk-ng). This is no longer necessary because the current Zephyr SDK (sdk-ng) already has its own `zephyr` toolchain variant, which fully replaces the `xtools` toolchain variant, and the `xtools` toolchain variant serves no purpose at all. Signed-off-by: Stephanos Ioannidis <[email protected]>
1 parent 3d8e651 commit a9d85ae

File tree

2 files changed

+12
-0
lines changed

2 files changed

+12
-0
lines changed

cmake/modules/FindDeprecated.cmake

+10
Original file line numberDiff line numberDiff line change
@@ -68,6 +68,16 @@ if("CROSS_COMPILE" IN_LIST Deprecated_FIND_COMPONENTS)
6868
endif()
6969
endif()
7070

71+
if("XTOOLS" IN_LIST Deprecated_FIND_COMPONENTS)
72+
list(REMOVE_ITEM Deprecated_FIND_COMPONENTS XTOOLS)
73+
# This code was deprecated after Zephyr v3.3.0
74+
# When removing support for `xtools`, remember to also remove:
75+
# cmake/toolchain/xtools (folder with files)
76+
# doc/develop/toolchains/crosstool_ng.rst and update the index.rst file.
77+
message(DEPRECATION "XTOOLS toolchain variant is deprecated. "
78+
"Please set ZEPHYR_TOOLCHAIN_VARIANT to 'zephyr'")
79+
endif()
80+
7181
if(NOT "${Deprecated_FIND_COMPONENTS}" STREQUAL "")
7282
message(STATUS "The following deprecated component(s) could not be found: "
7383
"${Deprecated_FIND_COMPONENTS}")

cmake/toolchain/xtools/generic.cmake

+2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
# SPDX-License-Identifier: Apache-2.0
22

3+
find_package(Deprecated COMPONENTS XTOOLS)
4+
35
zephyr_get(XTOOLS_TOOLCHAIN_PATH)
46
assert( XTOOLS_TOOLCHAIN_PATH "XTOOLS_TOOLCHAIN_PATH is not set")
57

0 commit comments

Comments
 (0)