cmake: Rework CMake scripts for restructured bundle

This commit reworks the CMake scripts to work with the restructured
distribution bundle directory structure.

Signed-off-by: Stephanos Ioannidis <[email protected]>

Author: stephanosio

cmake/Zephyr-sdkConfig.cmake

@@ -11,7 +11,7 @@ set(SDK_MAJOR_MINOR_MICRO ${SDK_VERSION})
 
 get_filename_component(ZEPHYR_SDK_INSTALL_DIR ${CMAKE_CURRENT_LIST_DIR}/.. ABSOLUTE)
 set(ZEPHYR_SDK_INSTALL_DIR ${ZEPHYR_SDK_INSTALL_DIR})
-set(ZEPHYR_TOOLCHAIN_VARIANT zephyr)
+set(ZEPHYR_TOOLCHAIN_VARIANT zephyr-gnu)
 
 # Those are CMake package parameters.
 set(Zephyr-sdk_FOUND True)

cmake/zephyr/Kconfig

@@ -16,6 +16,6 @@ config TOOLCHAIN_ZEPHYR_SUPPORTS_GNU_EXTENSIONS
 
 config PICOLIBC_SUPPORTED
 	def_bool y
-	depends on "$(ZEPHYR_TOOLCHAIN_VARIANT)" = "zephyr"
+	depends on "$(ZEPHYR_TOOLCHAIN_VARIANT)" = "zephyr-gnu"
 	help
 	  Zephyr SDK >=0.16 always supports Picolibc for C and C++ development.

cmake/zephyr/generic.cmake renamed to cmake/zephyr/gnu/generic.cmake

@@ -1,6 +1,6 @@
 # SPDX-License-Identifier: Apache-2.0
 
-set(TOOLCHAIN_HOME ${ZEPHYR_SDK_INSTALL_DIR})
+set(TOOLCHAIN_HOME ${ZEPHYR_SDK_INSTALL_DIR}/gnu)
 
 set(COMPILER gcc)
 set(LINKER ld)

cmake/zephyr/target.cmake renamed to cmake/zephyr/gnu/target.cmake

@@ -26,8 +26,8 @@ set(CROSS_COMPILE_TARGET_sparc     sparc-zephyr-elf)
 set(CROSS_COMPILE_TARGET ${CROSS_COMPILE_TARGET_${ARCH}})
 set(SYSROOT_TARGET       ${CROSS_COMPILE_TARGET})
 
-set(SYSROOT_DIR   ${ZEPHYR_SDK_INSTALL_DIR}/${SYSROOT_TARGET}/${SYSROOT_TARGET})
-set(CROSS_COMPILE ${ZEPHYR_SDK_INSTALL_DIR}/${CROSS_COMPILE_TARGET}/bin/${CROSS_COMPILE_TARGET}-)
+set(SYSROOT_DIR   ${ZEPHYR_SDK_INSTALL_DIR}/gnu/${SYSROOT_TARGET}/${SYSROOT_TARGET})
+set(CROSS_COMPILE ${ZEPHYR_SDK_INSTALL_DIR}/gnu/${CROSS_COMPILE_TARGET}/bin/${CROSS_COMPILE_TARGET}-)
 
 if("${ARCH}" STREQUAL "x86")
   if(CONFIG_X86_64)

cmake/zephyr/host-tools.cmake

@@ -1,7 +1,7 @@
 # SPDX-License-Identifier: Apache-2.0
 
 cmake_host_system_information(RESULT TOOLCHAIN_ARCH QUERY OS_PLATFORM)
-set(HOST_TOOLS_HOME ${ZEPHYR_SDK_INSTALL_DIR}/sysroots/${TOOLCHAIN_ARCH}-pokysdk-linux)
+set(HOST_TOOLS_HOME ${ZEPHYR_SDK_INSTALL_DIR}/hosttools/sysroots/${TOOLCHAIN_ARCH}-pokysdk-linux)
 
 # Path used for searching by the find_*() functions, with appropriate
 # suffixes added. Ensures that the SDK's host tools will be found when