OrgZephyr/zephyr
OrgZephyr
/
zephyr
mirror of https://github.com/zephyrproject-rtos/zephyr.git
1
0
Fork 0
Code Issues Releases Wiki Activity

cmake: Fix "make usage" regression from the ZEPHYR_BASE change 

$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 <sebastian.boe@nordicsemi.no>
This commit is contained in:
Sebastian Bøe 2018-01-18 15:55:36 +01:00 committed by Anas Nashif
parent b0d8075709
commit 690bea3a3c
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cmake/usage/usage.cmake
View File

@ -12,7 +12,7 @@ set(arch_list
xtensa xtensa
) )
set(board_dir ${ZEPHYR_BASE}/boards) set(board_dir $ENV{ZEPHYR_BASE}/boards)
foreach(arch ${arch_list}) foreach(arch ${arch_list})
set(board_arch_dir ${board_dir}/${arch}) set(board_arch_dir ${board_dir}/${arch})