diff options
| author | bors <bors@rust-lang.org> | 2019-12-17 17:56:13 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2019-12-17 17:56:13 +0000 |
| commit | 3ed3b8bb7b100afecf7d5f52eafbb70fec27f537 (patch) | |
| tree | a08ae525d2a85b7d8dbbed3a2c86f53353afa73e /src/ci | |
| parent | 99b89533d4cdf7682ea4054ad0ee36c351d05df1 (diff) | |
| parent | 5d4e59bc91374e095d9679e76551a06a151bc0b9 (diff) | |
| download | rust-3ed3b8bb7b100afecf7d5f52eafbb70fec27f537.tar.gz rust-3ed3b8bb7b100afecf7d5f52eafbb70fec27f537.zip | |
Auto merge of #67362 - Mark-Simulacrum:par-4-default, r=alexcrichton
4 thread parallelism by default The Session default here is super unusual but seems to both compile and do what we expect as best as I can tell.
Diffstat (limited to 'src/ci')
| -rwxr-xr-x | src/ci/run.sh | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/ci/run.sh b/src/ci/run.sh index 38d1d2baf25..4afd61bf8a7 100755 --- a/src/ci/run.sh +++ b/src/ci/run.sh @@ -37,6 +37,8 @@ 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 @@ -53,9 +55,6 @@ 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 |