diff options
| author | Adam Trhon <adam.trhon@tbs-biometrics.com> | 2019-02-19 09:12:22 +0000 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2019-02-25 22:27:38 +0000 |
| commit | 391d8a0fcaf6e90f73511451771a61fdb4547344 (patch) | |
| tree | 478efe2ca453c5655c2747e223e9806e20471c0d /meta/recipes-devtools | |
| parent | cd32a7d08904b3282209a3fd50af15128daf2494 (diff) | |
| download | poky-391d8a0fcaf6e90f73511451771a61fdb4547344.tar.gz | |
icecc-env: don't raise error when icecc not installed
When icecc is not installed, the `which icecc` command in icecc-env.sh
returns nonzero. This happens when environment is being sourced. When
the terminal has `set -e`, the whole script fails and terminal is
closed.
Fix this by ignoring errors from the which command.
(From OE-Core rev: 84c63858be47d33e49140181d73c253886d5aec5)
Signed-off-by: Adam Trhon <adam.trhon@tbs-biometrics.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Signed-off-by: Armin Kuster <akuster808@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools')
| -rw-r--r-- | meta/recipes-devtools/icecc-toolchain/icecc-toolchain/icecc-env.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/meta/recipes-devtools/icecc-toolchain/icecc-toolchain/icecc-env.sh b/meta/recipes-devtools/icecc-toolchain/icecc-toolchain/icecc-env.sh index 94760076bf..990d2fb448 100644 --- a/meta/recipes-devtools/icecc-toolchain/icecc-toolchain/icecc-env.sh +++ b/meta/recipes-devtools/icecc-toolchain/icecc-toolchain/icecc-env.sh | |||
| @@ -21,7 +21,7 @@ | |||
| 21 | # | 21 | # |
| 22 | 22 | ||
| 23 | if [ -z "$ICECC_PATH" ]; then | 23 | if [ -z "$ICECC_PATH" ]; then |
| 24 | ICECC_PATH=$(which icecc 2> /dev/null) | 24 | ICECC_PATH=$(which icecc 2> /dev/null || true) |
| 25 | fi | 25 | fi |
| 26 | 26 | ||
| 27 | if [ -n "$ICECC_PATH" ]; then | 27 | if [ -n "$ICECC_PATH" ]; then |