diff options
| author | Michael Olbrich <m.olbrich@pengutronix.de> | 2014-07-02 09:51:41 +0200 |
|---|---|---|
| committer | Michael Olbrich <m.olbrich@pengutronix.de> | 2014-07-02 10:30:52 +0200 |
| commit | bf3f513fdabfd31e2d739c78cb761a47710787dd (patch) | |
| tree | 08a25c162d068aa10ba20fe1c0067106f0716517 /bin | |
| parent | d7ccbe4acbd4cebb81f4fc3ac4bda0bfb019b6fe (diff) | |
| download | ptxdist-bf3f513fdabfd31e2d739c78cb761a47710787dd.tar.gz ptxdist-bf3f513fdabfd31e2d739c78cb761a47710787dd.tar.xz | |
ptxdist: be more verbose when icecc setup fails
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
Diffstat (limited to 'bin')
| -rwxr-xr-x | bin/ptxdist | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/bin/ptxdist b/bin/ptxdist index e1aa51e17..28ff7d919 100755 --- a/bin/ptxdist +++ b/bin/ptxdist @@ -717,16 +717,23 @@ check_compiler() { local icecc_dir="${sysroot_host}/lib/icecc" if [ "$(readlink -f "${icecc_dir}/toolchain")" != "${toolchain}" ]; then rm -rf "${icecc_dir}" && + if ! "${PTXDIST_ICECC}" --version | grep -q 'ICECC 1\.'; then + ptxd_bailout "PTXdist only supports icecc 1.x" + fi mkdir -p "${icecc_dir}/target" "${icecc_dir}/host" && ( + echo "Creating icecc target environment..." cd "${icecc_dir}/target" "${PTXDIST_ICECC_CREATE_ENV}" --gcc \ "${wrapper_dir}/real/${compiler_prefix}gcc" \ - "${wrapper_dir}/real/${compiler_prefix}g++" > /dev/null 2>&1 && + "${wrapper_dir}/real/${compiler_prefix}g++" > /dev/null 2>&1 || \ + ptxd_bailout "Failed!" + echo "Creating icecc host environment..." cd "${icecc_dir}/host" "${PTXDIST_ICECC_CREATE_ENV}" --gcc \ "${wrapper_dir}/real/gcc" \ - "${wrapper_dir}/real/g++" > /dev/null 2>&1 + "${wrapper_dir}/real/g++" > /dev/null 2>&1 || \ + ptxd_bailout "Failed!" ) && ln -s "${toolchain}" "${icecc_dir}/toolchain" fi || return @@ -2463,6 +2470,8 @@ setup_path() { echo "${PTXDIST_LOG_PROMPT}warning: icecc has been activated, but was not found on your system" echo "${PTXDIST_LOG_PROMPT}warning: install icecc, disable it ('ptxdist setup' -> 'Developer Options' menu)" echo "${PTXDIST_LOG_PROMPT}warning: or ignore this warning." + echo "${PTXDIST_LOG_PROMPT}icecc: '${PTXDIST_ICECC:=not found}'" + echo "${PTXDIST_LOG_PROMPT}icecc-create-env: '${PTXDIST_ICECC_CREATE_ENV:=not found}'" echo sleep 3 fi |