cmake: locate Zephyr SDK before locating other host tools.
Follow-up: #49672 Zephyr SDK and host tools detection was reworked in #49672. That rework accidentally changed the lookup order from: - Zephyr SDK - Other host tools - Generic (host) C compiler into - Other host tools - Zephyr SDK - Generic (host) C compiler this causes host tools shipped with Zephyr SDK, such as openocd to not be discovered unless in path. Restore the original order so that Zephyr SDK is located first so that host tools from the SDK can be found without having them in path. Signed-off-by: Torsten Rasmussen <Torsten.Rasmussen@nordicsemi.no>
This commit is contained in:
parent
680574f960
commit
f6979306bc
@ -48,6 +48,10 @@ if(HostTools_FOUND)
|
||||
return()
|
||||
endif()
|
||||
|
||||
find_package(Deprecated COMPONENTS XCC_USE_CLANG CROSS_COMPILE)
|
||||
|
||||
find_package(Zephyr-sdk 0.15)
|
||||
|
||||
# gperf is an optional dependency
|
||||
find_program(GPERF gperf)
|
||||
|
||||
@ -61,10 +65,6 @@ find_program(BOSSAC bossac)
|
||||
# in the mcuboot repository if that's present in some cases)
|
||||
find_program(IMGTOOL imgtool)
|
||||
|
||||
find_package(Deprecated COMPONENTS XCC_USE_CLANG CROSS_COMPILE)
|
||||
|
||||
find_package(Zephyr-sdk 0.15)
|
||||
|
||||
# Pick host system's toolchain if we are targeting posix
|
||||
if("${ARCH}" STREQUAL "posix")
|
||||
if(NOT "${ZEPHYR_TOOLCHAIN_VARIANT}" STREQUAL "llvm")
|
||||
|
||||
Loading…
Reference in New Issue
Block a user