Skip to content

Commit 993e3ee

Browse files
committed
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]>
1 parent 4c86d1e commit 993e3ee

File tree

3 files changed

+4
-4
lines changed

3 files changed

+4
-4
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# SPDX-License-Identifier: Apache-2.0
22

3-
set(TOOLCHAIN_HOME ${ZEPHYR_SDK_INSTALL_DIR})
3+
set(TOOLCHAIN_HOME ${ZEPHYR_SDK_INSTALL_DIR}/gnu)
44

55
set(COMPILER gcc)
66
set(LINKER ld)

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,8 @@ set(CROSS_COMPILE_TARGET_sparc sparc-zephyr-elf)
2626
set(CROSS_COMPILE_TARGET ${CROSS_COMPILE_TARGET_${ARCH}})
2727
set(SYSROOT_TARGET ${CROSS_COMPILE_TARGET})
2828

29-
set(SYSROOT_DIR ${ZEPHYR_SDK_INSTALL_DIR}/${SYSROOT_TARGET}/${SYSROOT_TARGET})
30-
set(CROSS_COMPILE ${ZEPHYR_SDK_INSTALL_DIR}/${CROSS_COMPILE_TARGET}/bin/${CROSS_COMPILE_TARGET}-)
29+
set(SYSROOT_DIR ${ZEPHYR_SDK_INSTALL_DIR}/gnu/${SYSROOT_TARGET}/${SYSROOT_TARGET})
30+
set(CROSS_COMPILE ${ZEPHYR_SDK_INSTALL_DIR}/gnu/${CROSS_COMPILE_TARGET}/bin/${CROSS_COMPILE_TARGET}-)
3131

3232
if("${ARCH}" STREQUAL "x86")
3333
if(CONFIG_X86_64)

cmake/zephyr/host-tools.cmake

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# SPDX-License-Identifier: Apache-2.0
22

33
cmake_host_system_information(RESULT TOOLCHAIN_ARCH QUERY OS_PLATFORM)
4-
set(HOST_TOOLS_HOME ${ZEPHYR_SDK_INSTALL_DIR}/sysroots/${TOOLCHAIN_ARCH}-pokysdk-linux)
4+
set(HOST_TOOLS_HOME ${ZEPHYR_SDK_INSTALL_DIR}/hosttools/sysroots/${TOOLCHAIN_ARCH}-pokysdk-linux)
55

66
# Path used for searching by the find_*() functions, with appropriate
77
# suffixes added. Ensures that the SDK's host tools will be found when

0 commit comments

Comments
 (0)