diff options
| author | Mark Rousskov <mark.simulacrum@gmail.com> | 2019-12-17 16:28:33 -0500 |
|---|---|---|
| committer | Mark Rousskov <mark.simulacrum@gmail.com> | 2019-12-17 16:28:33 -0500 |
| commit | 7f00a5f26a4687c0c667d2ca02cb73eef677ae2e (patch) | |
| tree | 82ce6096679ca921b3eb76f24cf8480ecfc77802 /src/ci | |
| parent | 3ed3b8bb7b100afecf7d5f52eafbb70fec27f537 (diff) | |
| download | rust-7f00a5f26a4687c0c667d2ca02cb73eef677ae2e.tar.gz rust-7f00a5f26a4687c0c667d2ca02cb73eef677ae2e.zip | |
Revert "Auto merge of #67362 - Mark-Simulacrum:par-4-default, r=alexcrichton"
This reverts commit 3ed3b8bb7b100afecf7d5f52eafbb70fec27f537, reversing changes made to 99b89533d4cdf7682ea4054ad0ee36c351d05df1. We will reland a similar patch at a future date but for now we should get a nightly released in a few hours with the parallel patch, so this should be reverted to make sure that the next nightly is not parallel-enabled.
Diffstat (limited to 'src/ci')
| -rwxr-xr-x | src/ci/run.sh | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/ci/run.sh b/src/ci/run.sh index 4afd61bf8a7..38d1d2baf25 100755 --- a/src/ci/run.sh +++ b/src/ci/run.sh @@ -37,8 +37,6 @@ if [ "$DIST_SRC" = "" ]; then RUST_CONFIGURE_ARGS="$RUST_CONFIGURE_ARGS --disable-dist-src" fi -RUST_CONFIGURE_ARGS="$RUST_CONFIGURE_ARGS --set rust.parallel-compiler" - # If we're deploying artifacts then we set the release channel, otherwise if # we're not deploying then we want to be sure to enable all assertions because # we'll be running tests @@ -55,6 +53,9 @@ if [ "$DEPLOY$DEPLOY_ALT" = "1" ]; then if [ "$NO_LLVM_ASSERTIONS" = "1" ]; then RUST_CONFIGURE_ARGS="$RUST_CONFIGURE_ARGS --disable-llvm-assertions" elif [ "$DEPLOY_ALT" != "" ]; then + if [ "$NO_PARALLEL_COMPILER" = "" ]; then + RUST_CONFIGURE_ARGS="$RUST_CONFIGURE_ARGS --set rust.parallel-compiler" + fi RUST_CONFIGURE_ARGS="$RUST_CONFIGURE_ARGS --enable-llvm-assertions" RUST_CONFIGURE_ARGS="$RUST_CONFIGURE_ARGS --set rust.verify-llvm-ir" fi |