From 690bea3a3c8007dce0c822e3fff353abc7f6cd56 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sebastian=20B=C3=B8e?= Date: Thu, 18 Jan 2018 15:55:36 +0100 Subject: [PATCH] cmake: Fix "make usage" regression from the ZEPHYR_BASE change MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit $ENV{ZEPHYR_BASE} was recently search-replaced with ${ZEPHYR_BASE}, but some CMake code, like usage.cmake, is run by a seperate CMake build system that does not have access to the CMake variable ZEPHYR_BASE. This patch reverts the usage of ${ZEPHYR_BASE} back to use $ENV{ZEPHYR_BASE} in usage.cmake. This has been proven to work on both Windows and Linux. Signed-off-by: Sebastian Bøe --- cmake/usage/usage.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmake/usage/usage.cmake b/cmake/usage/usage.cmake index b78002b5387..3bd4f2b6a24 100644 --- a/cmake/usage/usage.cmake +++ b/cmake/usage/usage.cmake @@ -12,7 +12,7 @@ set(arch_list xtensa ) -set(board_dir ${ZEPHYR_BASE}/boards) +set(board_dir $ENV{ZEPHYR_BASE}/boards) foreach(arch ${arch_list}) set(board_arch_dir ${board_dir}/${arch})