michaelh/zephyr
1
0
Fork 0
Code Releases Activity

xtensa: changing $ENV{ZEPHYR_SDK_INSTALL_DIR} to CMake var

Browse source 
ZEPHYR_SDK_INSTALL_DIR will be set as an internal CMake variable when
using the Zephyr SDK.
The Zephyr SDK zephyr/host-tools.cmake will ensure to set the CMake
ZEPHYR_SDK_INSTALL_DIR variable to the environment setting, or the
install directory in case the CMake package was used.

Users not using the environment variable will experience the following
error:
```
Linking C executable zephyr/.../bootloader/bootloader.elf
FAILED: zephyr/.../bootloader/bootloader.elf
<path>/xtensa-zephyr-elf/bin/ld: cannot find -lhal
```

This commit ensures code build correctly both when setting the
environment variable ZEPHYR_SDK_INSTALL_DIR, and when using Zephyr SDK
CMake `find_package(Zephyr-sdk)`

Signed-off-by: Torsten Rasmussen <Torsten.Rasmussen@nordicsemi.no>
This commit is contained in:
Torsten Rasmussen 2020-07-02 13:15:57 +02:00 • committed by Andrew Boie
commit bab3a2562e
1 changed files with 1 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

2
soc/xtensa/intel_apl_adsp/common/bootloader/CMakeLists.txt
View file

@ -23,7 +23,7 @@ add_executable(bootloader
add_dependencies(bootloader ${SYSCALL_LIST_H_TARGET})
set(zephyr_sdk $ENV{ZEPHYR_SDK_INSTALL_DIR})
set(zephyr_sdk ${ZEPHYR_SDK_INSTALL_DIR})
target_include_directories(bootloader PUBLIC
./