diff options
| author | John Kåre Alsaker <john.kare.alsaker@gmail.com> | 2019-01-28 19:22:55 +0100 |
|---|---|---|
| committer | John Kåre Alsaker <john.kare.alsaker@gmail.com> | 2019-01-28 19:22:55 +0100 |
| commit | a015f7f61ffba8ef2ea53320de8f3a6cd53561fe (patch) | |
| tree | 68fb8f1b5071caf05907ed9472b30a3397ffe471 | |
| parent | 975eb312eff3f8e3453e1836995e485b5086515d (diff) | |
| download | rust-a015f7f61ffba8ef2ea53320de8f3a6cd53561fe.tar.gz rust-a015f7f61ffba8ef2ea53320de8f3a6cd53561fe.zip | |
Fix CI
| -rwxr-xr-x | src/bootstrap/configure.py | 2 | ||||
| -rwxr-xr-x | src/ci/run.sh | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/bootstrap/configure.py b/src/bootstrap/configure.py index 7b70236dfe8..b2d8f2d8ebf 100755 --- a/src/bootstrap/configure.py +++ b/src/bootstrap/configure.py @@ -35,7 +35,7 @@ o("debug", "rust.debug", "enables debugging environment; does not affect optimiz o("docs", "build.docs", "build standard library documentation") o("compiler-docs", "build.compiler-docs", "build compiler documentation") o("optimize-tests", "rust.optimize-tests", "build tests with optimizations") -o("experimental-parallel-queries", "rust.experimental-parallel-queries", "build rustc with experimental parallelization") +o("parallel-compiler", "rust.parallel-compiler", "build a multi-threaded rustc") o("test-miri", "rust.test-miri", "run miri's test suite") o("debuginfo-tests", "rust.debuginfo-tests", "build tests with debugger metadata") o("verbose-tests", "rust.verbose-tests", "enable verbose output when running tests") diff --git a/src/ci/run.sh b/src/ci/run.sh index b0e1b165105..42d0d7db596 100755 --- a/src/ci/run.sh +++ b/src/ci/run.sh @@ -82,7 +82,7 @@ fi SCCACHE_IDLE_TIMEOUT=10800 sccache --start-server || true if [ "$RUN_CHECK_WITH_PARALLEL_QUERIES" != "" ]; then - $SRC/configure --enable-experimental-parallel-queries + $SRC/configure --enable-parallel-compiler CARGO_INCREMENTAL=0 python2.7 ../x.py check rm -f config.toml rm -rf build |