diff options
| author | bors <bors@rust-lang.org> | 2020-03-24 09:38:41 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2020-03-24 09:38:41 +0000 |
| commit | 1add455ec6f81045e7651c6225902823f5d4fbfa (patch) | |
| tree | c77d40057ab6672b15e83d34aef1f0dd30a8b6c5 /src/ci/scripts | |
| parent | 9d0ae58d30523198dec60a9cd840c30c2bd9c4c0 (diff) | |
| parent | 6db4bb68d18fa371fd2eac1e97f2e2413315ef5d (diff) | |
| download | rust-1add455ec6f81045e7651c6225902823f5d4fbfa.tar.gz rust-1add455ec6f81045e7651c6225902823f5d4fbfa.zip | |
Auto merge of #69894 - vtbassmatt:master, r=nellshamrell
establish immutable source for RUST_CONFIGURE_ARGS fixes https://github.com/rust-lang/rust/issues/68671
Diffstat (limited to 'src/ci/scripts')
| -rwxr-xr-x | src/ci/scripts/setup-environment.sh | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/src/ci/scripts/setup-environment.sh b/src/ci/scripts/setup-environment.sh index e126a06edab..d134fcd47ba 100755 --- a/src/ci/scripts/setup-environment.sh +++ b/src/ci/scripts/setup-environment.sh @@ -8,6 +8,19 @@ IFS=$'\n\t' source "$(cd "$(dirname "$0")" && pwd)/../shared.sh" +# Since matrix variables are readonly in Azure Pipelines, we take +# INITIAL_RUST_CONFIGURE_ARGS and establish RUST_CONFIGURE_ARGS +# which downstream steps can alter +# macOS ships with Bash 3.16, so we cannot use [[ -v FOO ]], +# which was introduced in Bash 4.2 +if [[ -z "${INITIAL_RUST_CONFIGURE_ARGS+x}" ]]; then + INITIAL_RUST_CONFIG="" + echo "No initial Rust configure args set" +else + INITIAL_RUST_CONFIG="${INITIAL_RUST_CONFIGURE_ARGS}" + ciCommandSetEnv RUST_CONFIGURE_ARGS "${INITIAL_RUST_CONFIG}" +fi + # Builders starting with `dist-` are dist builders, but if they also end with # `-alt` they are alternate dist builders. if [[ "${CI_JOB_NAME}" = dist-* ]]; then |