diff options
| author | bors <bors@rust-lang.org> | 2020-08-29 06:08:37 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2020-08-29 06:08:37 +0000 |
| commit | d8424f6b426f91ae39dbeacd631a82aad5d733f4 (patch) | |
| tree | 2cc658ad4c12c81cf1680608e01c5e5a3934048c /src/ci/github-actions | |
| parent | 17fb1254b8f085c0787cc8f11ac466fcc2d8c488 (diff) | |
| parent | 8b501e33e5b873b66bc421cc142d4c7430d8f005 (diff) | |
| download | rust-d8424f6b426f91ae39dbeacd631a82aad5d733f4.tar.gz rust-d8424f6b426f91ae39dbeacd631a82aad5d733f4.zip | |
Auto merge of #74922 - joshtriplett:ninja-by-default, r=Mark-Simulacrum
Set ninja=true by default Ninja substantially improves LLVM build time. On a 96-way system, using Make took 248s, and using Ninja took 161s, a 35% improvement. We already require a variety of tools to build Rust. If someone wants to build without Ninja (for instance, to minimize the set of packages required to bootstrap a new target), they can easily set `ninja=false` in `config.toml`. Our defaults should help people build Rust (and LLVM) faster, to speed up development.
Diffstat (limited to 'src/ci/github-actions')
| -rw-r--r-- | src/ci/github-actions/ci.yml | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/ci/github-actions/ci.yml b/src/ci/github-actions/ci.yml index d5abfe9f9bb..522d5bd3d9c 100644 --- a/src/ci/github-actions/ci.yml +++ b/src/ci/github-actions/ci.yml @@ -605,7 +605,7 @@ jobs: - name: dist-x86_64-apple env: SCRIPT: ./x.py dist - RUST_CONFIGURE_ARGS: --target=aarch64-apple-ios,x86_64-apple-ios --enable-full-tools --enable-sanitizers --enable-profiler --set rust.jemalloc + RUST_CONFIGURE_ARGS: --target=aarch64-apple-ios,x86_64-apple-ios --enable-full-tools --enable-sanitizers --enable-profiler --set rust.jemalloc --set llvm.ninja=false RUSTC_RETRY_LINKER_ON_SEGFAULT: 1 MACOSX_DEPLOYMENT_TARGET: 10.7 NO_LLVM_ASSERTIONS: 1 @@ -620,7 +620,7 @@ jobs: - name: dist-x86_64-apple-alt env: SCRIPT: ./x.py dist - RUST_CONFIGURE_ARGS: --enable-extended --enable-profiler --set rust.jemalloc + RUST_CONFIGURE_ARGS: --enable-extended --enable-profiler --set rust.jemalloc --set llvm.ninja=false RUSTC_RETRY_LINKER_ON_SEGFAULT: 1 MACOSX_DEPLOYMENT_TARGET: 10.7 NO_LLVM_ASSERTIONS: 1 @@ -634,7 +634,7 @@ jobs: - name: x86_64-apple env: SCRIPT: ./x.py --stage 2 test - RUST_CONFIGURE_ARGS: --build=x86_64-apple-darwin --enable-sanitizers --enable-profiler --set rust.jemalloc + RUST_CONFIGURE_ARGS: --build=x86_64-apple-darwin --enable-sanitizers --enable-profiler --set rust.jemalloc --set llvm.ninja=false RUSTC_RETRY_LINKER_ON_SEGFAULT: 1 MACOSX_DEPLOYMENT_TARGET: 10.8 MACOSX_STD_DEPLOYMENT_TARGET: 10.7 |