modules/trusted-firmware-m: Yet another work-around for SDK 0.18 dir change

SDK 0.18 adds a gratuitous subdirectory for gnu toolchains. To retain
compatibility with older toolchains (which otherwise work fine), switch
from using ${ZEPHYR_SDK_INSTALL_DIR} to ${TOOLCHAIN_HOME}, which 0.17 sets
to ${ZEPHYR_SDK_INSTALL_DIR} and 0.18 sets to ${ZEPHYR_SDK_INSTALL_DIR}/gnu

Signed-off-by: Keith Packard <[email protected]>

Author: keith-packard

modules/trusted-firmware-m/CMakeLists.txt

@@ -219,12 +219,10 @@ if (CONFIG_BUILD_WITH_TFM)
   if(${ZEPHYR_TOOLCHAIN_VARIANT} STREQUAL "zephyr")
     set(TFM_TOOLCHAIN_FILE "toolchain_GNUARM.cmake")
     set(TFM_TOOLCHAIN_PREFIX "arm-zephyr-eabi")
-    if(${TOOLCHAIN_VARIANT_COMPILER} STREQUAL "gnu")
-      set(TFM_TOOLCHAIN_PATH ${ZEPHYR_SDK_INSTALL_DIR}/gnu/arm-zephyr-eabi/bin)
-    elseif(${TOOLCHAIN_VARIANT_COMPILER} STREQUAL "llvm")
+    if(${TOOLCHAIN_VARIANT_COMPILER} STREQUAL "llvm")
       set(TFM_TOOLCHAIN_PATH ${ZEPHYR_SDK_INSTALL_DIR}/llvm/bin)
     else()
-      set(TFM_TOOLCHAIN_PATH ${ZEPHYR_SDK_INSTALL_DIR}/arm-zephyr-eabi/bin)
+      set(TFM_TOOLCHAIN_PATH ${TOOLCHAIN_HOME}/arm-zephyr-eabi/bin)
     endif()
   elseif(${ZEPHYR_TOOLCHAIN_VARIANT} STREQUAL "gnuarmemb")
     set(TFM_TOOLCHAIN_FILE "toolchain_GNUARM.cmake")