commit d7727b9415d220d7147ddbca3bd73ad7cadadae9
author Jeremy Bettis <jbettis@google.com> Thu Aug 04 16:51:09 2022 -0600
committer Carles Cufí <carles.cufi@nordicsemi.no> Fri Aug 05 14:03:15 2022 +0200
tree b18374307dde2fa7449e3ad3b87ba6a4e7738682
parent cd7c44a152bc4469ad7da9e38d58df46655d460d

cmake: Use cmake var not env for sdk

ZEPHYR_SDK_INSTALL_DIR is set from the env if it is not passed
explicitly to cmake, but one usage was reading directly from the env,
not allowing passing the var to cmake instead.

Change find_package of Zephyr-sdk to read from cmake var not env var.

Signed-off-by: Jeremy Bettis <jbettis@google.com>

cmake/modules/verify-toolchain.cmake

diff --git a/cmake/modules/verify-toolchain.cmake b/cmake/modules/verify-toolchain.cmake
index 702e44b..b59eb7e 100644
--- a/cmake/modules/verify-toolchain.cmake
+++ b/cmake/modules/verify-toolchain.cmake
@@ -76,7 +76,7 @@
     # To support Zephyr SDK tools (DTC, and other tools) with 3rd party toolchains
     # then we keep track of current toolchain variant.
     set(ZEPHYR_CURRENT_TOOLCHAIN_VARIANT ${ZEPHYR_TOOLCHAIN_VARIANT})
-    find_package(Zephyr-sdk ${TOOLCHAIN_ZEPHYR_MINIMUM_REQUIRED_VERSION} REQUIRED QUIET HINTS $ENV{ZEPHYR_SDK_INSTALL_DIR})
+    find_package(Zephyr-sdk ${TOOLCHAIN_ZEPHYR_MINIMUM_REQUIRED_VERSION} REQUIRED QUIET HINTS ${ZEPHYR_SDK_INSTALL_DIR})
     if(DEFINED ZEPHYR_CURRENT_TOOLCHAIN_VARIANT)
       set(ZEPHYR_TOOLCHAIN_VARIANT ${ZEPHYR_CURRENT_TOOLCHAIN_VARIANT})
     endif()