summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJoshua Watt <jpewhacker@gmail.com>2018-05-15 09:52:29 -0500
committerRichard Purdie <richard.purdie@linuxfoundation.org>2018-05-22 13:13:33 +0100
commit0124d2d94e64f0073b78260fad0391f14942ba78 (patch)
tree36300b8a6342f9205510b3b8a70ff92452782c7e
parent83174004509c511ec93a0bc405ff0e55964f2291 (diff)
downloadpoky-0124d2d94e64f0073b78260fad0391f14942ba78.tar.gz
toolchain-shar-extract.sh: Preserve ICECC_PATH
ICECC_PATH wasn't being preserved in the environment when it was reinitialized. This prevented toolchain installs from being able to use icecream by setting ICECC_PATH when icecc isn't in $PATH (From OE-Core rev: c245ab9bee536c7b6af026a5eda02ae0695567b3) Signed-off-by: Joshua Watt <JPEWhacker@gmail.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/files/toolchain-shar-extract.sh1
1 files changed, 1 insertions, 0 deletions
diff --git a/meta/files/toolchain-shar-extract.sh b/meta/files/toolchain-shar-extract.sh
index f7ab43066f..9eabd62630 100644
--- a/meta/files/toolchain-shar-extract.sh
+++ b/meta/files/toolchain-shar-extract.sh
@@ -3,6 +3,7 @@
3[ -z "$ENVCLEANED" ] && exec /usr/bin/env -i ENVCLEANED=1 HOME="$HOME" \ 3[ -z "$ENVCLEANED" ] && exec /usr/bin/env -i ENVCLEANED=1 HOME="$HOME" \
4 LC_ALL=en_US.UTF-8 \ 4 LC_ALL=en_US.UTF-8 \
5 TERM=$TERM \ 5 TERM=$TERM \
6 ICECC_PATH="$ICECC_PATH" \
6 http_proxy="$http_proxy" https_proxy="$https_proxy" ftp_proxy="$ftp_proxy" \ 7 http_proxy="$http_proxy" https_proxy="$https_proxy" ftp_proxy="$ftp_proxy" \
7 no_proxy="$no_proxy" all_proxy="$all_proxy" GIT_PROXY_COMMAND="$GIT_PROXY_COMMAND" "$0" "$@" 8 no_proxy="$no_proxy" all_proxy="$all_proxy" GIT_PROXY_COMMAND="$GIT_PROXY_COMMAND" "$0" "$@"
8[ -f /etc/environment ] && . /etc/environment 9[ -f /etc/environment ] && . /etc/environment