patrick/zephyr
1
0
Fork 0
Code Issues Pull requests Actions 8 Packages Projects Releases Wiki Activity

cmake: remove deprecated XCC_USE_CLANG

Browse source 
This was deprecated in 3.0, so remove it now and remove all docs related
to it.

Signed-off-by: Anas Nashif <anas.nashif@intel.com>
This commit is contained in:
Anas Nashif 2023-12-12 07:46:13 -05:00 committed by Carles Cufí
parent cc4ffb2a54
commit 7da7768095
3 changed files with 1 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
cmake/modules/FindDeprecated.cmake
View file

@ -37,26 +37,6 @@ if("${Deprecated_FIND_COMPONENTS}" STREQUAL "")
message(WARNING "find_package(Deprecated) missing required COMPONENTS keyword")
endif()
if("XCC_USE_CLANG" IN_LIST Deprecated_FIND_COMPONENTS)
list(REMOVE_ITEM Deprecated_FIND_COMPONENTS XCC_USE_CLANG)
# This code was deprecated after Zephyr v3.0.0
# Keep XCC_USE_CLANG behaviour for a while.
if(NOT DEFINED ZEPHYR_TOOLCHAIN_VARIANT)
set(ZEPHYR_TOOLCHAIN_VARIANT $ENV{ZEPHYR_TOOLCHAIN_VARIANT})
endif()
if ("${ZEPHYR_TOOLCHAIN_VARIANT}" STREQUAL "xcc"
AND "$ENV{XCC_USE_CLANG}" STREQUAL "1")
set(ZEPHYR_TOOLCHAIN_VARIANT xt-clang CACHE STRING "Zephyr toolchain variant" FORCE)
message(DEPRECATION "XCC_USE_CLANG is deprecated. Please set ZEPHYR_TOOLCHAIN_VARIANT to 'xt-clang'")
endif()
if("${ZEPHYR_TOOLCHAIN_VARIANT}" STREQUAL "xcc-clang")
set(ZEPHYR_TOOLCHAIN_VARIANT xt-clang CACHE STRING "Zephyr toolchain variant" FORCE)
message(DEPRECATION "ZEPHYR_TOOLCHAIN_VARIANT 'xcc-clang' is deprecated. Please set ZEPHYR_TOOLCHAIN_VARIANT to 'xt-clang'")
endif()
endif()
if("CROSS_COMPILE" IN_LIST Deprecated_FIND_COMPONENTS)
list(REMOVE_ITEM Deprecated_FIND_COMPONENTS CROSS_COMPILE)
# This code was deprecated after Zephyr v3.1.0

2
cmake/modules/FindHostTools.cmake
View file

@ -48,7 +48,7 @@ if(HostTools_FOUND)
return()
endif()
find_package(Deprecated COMPONENTS XCC_USE_CLANG CROSS_COMPILE)
find_package(Deprecated COMPONENTS CROSS_COMPILE)
find_package(Zephyr-sdk 0.16)

4
doc/develop/toolchains/cadence_xcc.rst
View file

@ -68,7 +68,3 @@ Cadence Tensilica Xtensa C/C++ Compiler (XCC)
# Linux
export XCC_NO_G_FLAG=1
* Also note that setting :envvar:`XCC_USE_CLANG` to ``1`` and
:envvar:`ZEPHYR_TOOLCHAIN_VARIANT` to ``xcc`` is deprecated.
Set :envvar:`ZEPHYR_TOOLCHAIN_VARIANT` to ``xt-clang`` instead.