diff options
| author | Kumar Gala <kumar.gala@linaro.org> | 2017-12-08 14:17:54 -0600 |
|---|---|---|
| committer | Paul Sokolovskyy <paul.sokolovsky@linaro.org> | 2017-12-08 23:12:54 +0000 |
| commit | e6b654d9f9e7903531e85d91657994389d27061e (patch) | |
| tree | cce21bfd854f1fd0b9112ee8d7b126fa5cb53761 /zephyr-upstream | |
| parent | 8ecff9b50ac11cdfc5396b45c1c1361db9c735f0 (diff) | |
zephyr-upstream: Fix gccarmemb builds
We need to always set ZEPHYR_SDK_INSTALL_DIR to find prebuilt binaries
of things like 'conf'. This changed with the intro of cmake to Zephyr.
So when we do a gccarmemb it will look in ZEPHYR_SDK_INSTALL_DIR for
tools (this is kinda broken assumption).
Change-Id: I28d48ec423a432db6912a85e541565fab71057ab
Signed-off-by: Kumar Gala <kumar.gala@linaro.org>
Diffstat (limited to 'zephyr-upstream')
| -rwxr-xr-x | zephyr-upstream/builders.sh | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/zephyr-upstream/builders.sh b/zephyr-upstream/builders.sh index 0e00297940..28adce61da 100755 --- a/zephyr-upstream/builders.sh +++ b/zephyr-upstream/builders.sh @@ -32,14 +32,9 @@ head -5 Makefile # https://github.com/zephyrproject-rtos/meta-zephyr-sdk/releases/download/0.9.2/zephyr-sdk-0.9.2-setup.run # To install Zephyr SDK: ./zephyr-sdk-0.9.2-setup.run --quiet --nox11 -- <<< "${HOME}/srv/toolchain/zephyr-sdk-0.9.2" -case "${ZEPHYR_GCC_VARIANT}" in - gccarmemb) - export GCCARMEMB_TOOLCHAIN_PATH="${HOME}/srv/toolchain/gcc-arm-none-eabi-6-2017-q2-update" - ;; - zephyr) - export ZEPHYR_SDK_INSTALL_DIR="${HOME}/srv/toolchain/zephyr-sdk-0.9.2" - ;; -esac +export GCCARMEMB_TOOLCHAIN_PATH="${HOME}/srv/toolchain/gcc-arm-none-eabi-6-2017-q2-update" +# We building with the gccarmemb toolchain, we need ZEPHYR_SDK_INSTALL_DIR to find things like conf +export ZEPHYR_SDK_INSTALL_DIR="${HOME}/srv/toolchain/zephyr-sdk-0.9.2" # Set build environment variables LANG=C |