Skip to content

Commit de603c0

Browse files
ozhurakinashif
authored andcommitted
toolchain: Do not pollute TOOLCHAIN_HOME
Use it's own variable HOST_TOOLS_HOME for host tools and don't unconditionally set TOOLCHAIN_HOME, preventing the detection of llvm/clang host toolchain. Signed-off-by: Oleg Zhurakivskyy <[email protected]>
1 parent d4ce292 commit de603c0

File tree

1 file changed

+5
-5
lines changed

1 file changed

+5
-5
lines changed
Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
11
# SPDX-License-Identifier: Apache-2.0
22

33
if(MINGW)
4-
set(TOOLCHAIN_HOME ${ZEPHYR_SDK_INSTALL_DIR}/sysroots/i686-pokysdk-mingw32)
4+
set(HOST_TOOLS_HOME ${ZEPHYR_SDK_INSTALL_DIR}/sysroots/i686-pokysdk-mingw32)
55
else()
6-
set(TOOLCHAIN_HOME ${ZEPHYR_SDK_INSTALL_DIR}/sysroots/${TOOLCHAIN_ARCH}-pokysdk-linux)
6+
set(HOST_TOOLS_HOME ${ZEPHYR_SDK_INSTALL_DIR}/sysroots/${TOOLCHAIN_ARCH}-pokysdk-linux)
77
endif()
88

99
# Path used for searching by the find_*() functions, with appropriate
1010
# suffixes added. Ensures that the SDK's host tools will be found when
1111
# we call, e.g. find_program(QEMU qemu-system-x86)
12-
list(APPEND CMAKE_PREFIX_PATH ${TOOLCHAIN_HOME}/usr)
12+
list(APPEND CMAKE_PREFIX_PATH ${HOST_TOOLS_HOME}/usr)
1313

1414
# TODO: Use find_* somehow for these as well?
15-
set_ifndef(QEMU_BIOS ${TOOLCHAIN_HOME}/usr/share/qemu)
16-
set_ifndef(OPENOCD_DEFAULT_PATH ${TOOLCHAIN_HOME}/usr/share/openocd/scripts)
15+
set_ifndef(QEMU_BIOS ${HOST_TOOLS_HOME}/usr/share/qemu)
16+
set_ifndef(OPENOCD_DEFAULT_PATH ${HOST_TOOLS_HOME}/usr/share/openocd/scripts)

0 commit comments

Comments
 (0)