From e229cbcc5cc4f9d21ae128ab0e92e1b83684b8de Mon Sep 17 00:00:00 2001 From: Michael Olbrich Date: Fri, 3 May 2019 09:47:52 +0200 Subject: ptxdist: always check if PTXDIST_ICECC_REMOTE_CPP should be set The check is in the wrong place and PTXDIST_ICECC_REMOTE_CPP is only set when new icecc environments are built. Make sure it happens every time. Signed-off-by: Michael Olbrich --- bin/ptxdist | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/bin/ptxdist b/bin/ptxdist index 247b21339..d0cf1b931 100755 --- a/bin/ptxdist +++ b/bin/ptxdist @@ -559,9 +559,6 @@ check_compiler_icecc() { if ! "${PTXDIST_ICECC}" --version | grep -q 'ICECC 1\.'; then ptxd_bailout "PTXdist only supports icecc 1.x" fi - if "${PTXDIST_ICECC}" --help | grep -q ICECC_REMOTE_CPP; then - export PTXDIST_ICECC_REMOTE_CPP=1 - fi && mkdir -p "${icecc_dir}/target" "${icecc_dir}/host" && ( echo "Creating icecc host environment..." @@ -593,6 +590,9 @@ check_compiler_icecc() { if [ -n "${compiler_prefix}" ]; then ptxd_get_path "${icecc_dir}/target"/*.tar.gz && export ICECC_VERSION_TARGET="${ptxd_reply}" + fi && + if "${PTXDIST_ICECC}" --help | grep -q ICECC_REMOTE_CPP; then + export PTXDIST_ICECC_REMOTE_CPP=1 fi } -- cgit v1.2.3